refactor: support mac .pkg and cleanup download path references

_content/10/index.php

@@ -1,12 +1,12 @@
 <?php
 
   require_once _KEYMANCOM_INCLUDES . '/includes/template.php';
-  require_once _KEYMANCOM_INCLUDES . '/includes/ui/downloads.php';
   require_once _KEYMANCOM_INCLUDES . '/includes/appstore.php';
   require_once _KEYMANCOM_INCLUDES . '/includes/playstore.php';
 
   require_once _KEYMANCOM_INCLUDES . '/autoload.php';
   use Keyman\Site\Common\KeymanHosts;
+  use Keyman\Site\com\keyman\DownloadUI;
 
   // Required
   head([
@@ -49,7 +49,7 @@
 
 
 <?php
-  downloadSection('product_windows',    'windows', 'keymandesktop-$version.exe', 'stable');
+  DownloadUI::downloadSection('windows', 'stable');
 ?>
 
 <h3>What's New in Keyman Desktop 10 for Windows?</h3>
@@ -58,7 +58,7 @@
     supports Unicode 11.0 and BCP 47 language identifiers. Desktop 10 also includes additional user interface for Turkish.</p>
 
 <?php
-  downloadSection('product_macos',   'mac',     'keyman-$version.dmg', 'stable');
+  DownloadUI::downloadSection('mac', 'stable');
 ?>
 
 <h3>What's New in Keyman 10 for macOS?</h3>
@@ -68,7 +68,7 @@
   and easily install keyboard packages by double-clicking the kmp file.</p>
 
 <?php
-  downloadSection('product_android',            'android', 'keyman-$version.apk', 'stable');
+  DownloadUI::downloadSection('android', 'stable');
 ?>
 <p>Keyman for Android is also available on the Play Store.</p>
 <?= $playstoreTable ?>
@@ -92,7 +92,7 @@
   Swift 4.0 app.</p>
 
 <?php
-  downloadSection('product_keymanweb', 'web', 'keymanweb-$version.zip', 'stable');
+  DownloadUI::downloadSection('web', 'stable');
 ?>
 
 <h3>What's New in KeymanWeb 10?</h3>
@@ -104,7 +104,7 @@
 <h1 class='red underline'>Developer Software</h1>
 
 <?php
-  downloadSection('product_developer',    'developer', 'keymandeveloper-$version.exe', 'stable');
+  DownloadUI::downloadSection('developer', 'stable');
 ?>
 
 <p><a href="<?= KeymanHosts::Instance()->help_keyman_com ?>/developer/10.0/">Keyman Developer 10</a> allows you to create

_content/11/index.php

@@ -1,11 +1,11 @@
 <?php
   require_once _KEYMANCOM_INCLUDES . '/includes/template.php';
-  require_once _KEYMANCOM_INCLUDES . '/includes/ui/downloads.php';
   require_once _KEYMANCOM_INCLUDES . '/includes/appstore.php';
   require_once _KEYMANCOM_INCLUDES . '/includes/playstore.php';
 
   require_once _KEYMANCOM_INCLUDES . '/autoload.php';
   use Keyman\Site\Common\KeymanHosts;
+  use Keyman\Site\com\keyman\DownloadUI;
 
   // Required
   head([
@@ -66,7 +66,7 @@
 </ul>
 
 <?php
-  downloadSection('product_macos',   'mac',     'keyman-$version.dmg', 'stable');
+  DownloadUI::downloadSection('mac', 'stable');
 ?>
 
 <h3>What's New in Keyman 11 for macOS?</h3>
@@ -92,7 +92,7 @@
 </ul>
 
 <?php
-  downloadSection('product_android', 'android', 'keyman-$version.apk', 'stable');
+  DownloadUI::downloadSection('android', 'stable');
 ?>
 <li>Keyman for Android is available on the Play Store.</li>
 <?= $playstoreTable ?>
@@ -122,7 +122,7 @@
 </ul>
 
 <?php
-  downloadSection('product_keymanweb', 'web', 'keymanweb-$version.zip', 'stable');
+  DownloadUI::downloadSection('web', 'stable');
 ?>
 
 <!--h3>What's New in KeymanWeb 11?</h3-->
@@ -131,7 +131,7 @@
 <h1 class='red underline'>Developer Software</h1>
 
 <?php
-  downloadSection('product_developer',    'developer', 'keymandeveloper-$version.exe', 'stable');
+  DownloadUI::downloadSection('developer', 'stable');
 ?>
 
 <h3>What's new in Keyman Developer 11?</h3>

_content/12/index.php

@@ -1,8 +1,8 @@
 <?php
   require_once _KEYMANCOM_INCLUDES . '/includes/template.php';
-  require_once _KEYMANCOM_INCLUDES . '/includes/ui/downloads.php';
   require_once _KEYMANCOM_INCLUDES . '/includes/appstore.php';
   require_once _KEYMANCOM_INCLUDES . '/includes/playstore.php';
+  require_once _KEYMANCOM_INCLUDES . '/autoload.php';
   use \Keyman\Site\Common\KeymanHosts;
 
   // Required

_content/13/index.php

@@ -1,9 +1,10 @@
 <?php
 require_once _KEYMANCOM_INCLUDES . '/includes/template.php';
-require_once _KEYMANCOM_INCLUDES . '/includes/ui/downloads.php';
 require_once _KEYMANCOM_INCLUDES . '/includes/appstore.php';
 require_once _KEYMANCOM_INCLUDES . '/includes/playstore.php';
+require_once _KEYMANCOM_INCLUDES . '/autoload.php';
 use \Keyman\Site\Common\KeymanHosts;
+use Keyman\Site\com\keyman\DownloadUI;
 
 // Required
 head([

_content/14/index.php

@@ -1,11 +1,12 @@
 <?php
 
 require_once _KEYMANCOM_INCLUDES . '/includes/template.php';
-require_once _KEYMANCOM_INCLUDES . '/includes/ui/downloads.php';
 require_once _KEYMANCOM_INCLUDES . '/includes/appstore.php';
 require_once _KEYMANCOM_INCLUDES . '/includes/playstore.php';
+require_once _KEYMANCOM_INCLUDES . '/autoload.php';
 
 use Keyman\Site\Common\KeymanHosts;
+use Keyman\Site\com\keyman\DownloadUI;
 
 // Required
 head([
@@ -72,7 +73,7 @@
 <h1 class='red underline'>User Software</h1>
 
 <?php
-downloadSection('product_windows',   'windows',     'keyman-$version.exe', 'stable');
+DownloadUI::downloadSection('windows', 'stable');
 ?>
 
 <h3>What's New in Keyman 14 for Windows?</h3>
@@ -98,7 +99,7 @@
 
 
 <?php
-downloadSection('product_macos',   'mac',     'keyman-$version.dmg', 'stable');
+DownloadUI::downloadSection('mac', 'stable');
 ?>
 
 <h3>What's New in Keyman 14 for macOS?</h3>
@@ -144,7 +145,7 @@
 </ul>
 
 <?php
-downloadSection('product_android', 'android', 'keyman-$version.apk', 'stable');
+DownloadUI::downloadSection('android', 'stable');
 ?>
 
 <?= $playstoreTable ?>
@@ -188,7 +189,7 @@
 
 
 <?php
-downloadSection('product_keymanweb', 'web', 'keymanweb-$version.zip', 'stable');
+DownloadUI::downloadSection('web', 'stable');
 ?>
 
 <h3>What's New in KeymanWeb 14?</h3>
@@ -208,7 +209,7 @@
 <h1 class='red underline'>Developer Software</h1>
 
 <?php
-downloadSection('product_developer',    'developer', 'keymandeveloper-$version.exe', 'stable');
+DownloadUI::downloadSection('developer', 'stable');
 ?>
 
 <h3>What's new in Keyman Developer 14?</h3>

_content/15/index.php

@@ -1,11 +1,12 @@
 <?php
 
 require_once _KEYMANCOM_INCLUDES . '/includes/template.php';
-require_once _KEYMANCOM_INCLUDES . '/includes/ui/downloads.php';
 require_once _KEYMANCOM_INCLUDES . '/includes/appstore.php';
 require_once _KEYMANCOM_INCLUDES . '/includes/playstore.php';
+require_once _KEYMANCOM_INCLUDES . '/autoload.php';
 
 use Keyman\Site\Common\KeymanHosts;
+use Keyman\Site\com\keyman\DownloadUI;
 
 // Required
 head([
@@ -99,7 +100,7 @@
 <h1 class='red underline'>User Software</h1>
 
 <?php
-downloadSection('product_windows',   'windows',     'keyman-$version.exe', 'stable');
+DownloadUI::downloadSection('windows', 'stable');
 ?>
 
 <h3>What's New in Keyman 15 for Windows?</h3>
@@ -111,7 +112,7 @@
 
 
 <?php
-downloadSection('product_macos',   'mac',     'keyman-$version.dmg', 'stable');
+DownloadUI::downloadSection('mac', 'stable');
 ?>
 
 <h3>What's New in Keyman 15 for macOS?</h3>
@@ -146,7 +147,7 @@
 </ul>
 
 <?php
-downloadSection('product_android', 'android', 'keyman-$version.apk', 'stable');
+DownloadUI::downloadSection('android', 'stable');
 ?>
 
 <?= $playstoreTable ?>
@@ -184,7 +185,7 @@
 
 
 <?php
-downloadSection('product_keymanweb', 'web', 'keymanweb-$version.zip', 'stable');
+DownloadUI::downloadSection('web', 'stable');
 ?>
 
 <h3>What's New in KeymanWeb 15?</h3>
@@ -201,7 +202,7 @@
 <h1 class='red underline'>Developer Software</h1>
 
 <?php
-downloadSection('product_developer',    'developer', 'keymandeveloper-$version.exe', 'stable');
+DownloadUI::downloadSection('developer', 'stable');
 ?>
 
 <h3>What's new in Keyman Developer 15?</h3>

_content/developer/download.php

@@ -1,8 +1,8 @@
 <?php
   require_once _KEYMANCOM_INCLUDES . '/includes/template.php';
-  require_once _KEYMANCOM_INCLUDES . '/includes/ui/downloads.php';
   require_once _KEYMANCOM_INCLUDES . '/autoload.php';
   use Keyman\Site\Common\KeymanHosts;
+  use Keyman\Site\com\keyman\DownloadUI;
 
   // Required
   head([
@@ -25,7 +25,7 @@
 </p>
 
 <?php
-  downloadLargeCTA('Keyman Developer', 'developer', 'stable', 'keymandeveloper-$version.exe');
+  DownloadUI::downloadLargeCTA('developer', 'stable');
 ?>
 
 <h2 class='red underline'>Keyman Developer Command Line Tools</h2>

_content/downloads/_downloads.php

@@ -1,7 +1,9 @@
 <?php
-  downloadSection('product_windows',            'windows', 'keyman-$version.exe', 'stable');
-  downloadSection('product_macos',              'mac',     'keyman-$version.dmg', 'stable');
-  downloadSection('product_android',            'android', 'keyman-$version.apk', 'stable');
+  use \Keyman\Site\com\keyman\DownloadUI;
+
+  DownloadUI::downloadSection('windows', 'stable');
+  DownloadUI::downloadSection('mac',     'stable');
+  DownloadUI::downloadSection('android', 'stable');
 ?>
 
 <p><?= _m_Downloads('available_on_play_store') ?></p>
@@ -20,10 +22,10 @@
 <h2 class='red underline large'><?= _m_Downloads('products_for_software_developers') ?></h2>
 
 <?php
-  downloadSection('product_keymanweb',             'web',       'keymanweb-$version.zip',             'stable');
-  downloadSection('product_developer',             'developer', 'keymandeveloper-$version.exe',       'stable');
-  downloadSection('product_engine_android',        'android',   'keyman-engine-android-$version.zip', 'stable', 'android-engine');
-  downloadSection('product_engine_ios',            'ios',       'keyman-engine-ios-$version.zip',     'stable', 'ios-engine');
+  DownloadUI::downloadSection('web',       'stable');
+  DownloadUI::downloadSection('developer', 'stable');
+  DownloadUI::downloadSection('android',   'stable', 'android-engine');
+  DownloadUI::downloadSection('ios',       'stable', 'ios-engine');
 ?>
 
 <br/>

_content/downloads/all-versions/index.php

@@ -1,6 +1,5 @@
 <?php
 require_once _KEYMANCOM_INCLUDES . '/includes/template.php';
-require_once _KEYMANCOM_INCLUDES . '/includes/ui/downloads.php';
 use Keyman\Site\Common\KeymanHosts;
 use Keyman\Site\com\keyman\Util;
 

_content/downloads/index.php

@@ -1,8 +1,8 @@
 <?php
   require_once _KEYMANCOM_INCLUDES . '/includes/template.php';
-  require_once _KEYMANCOM_INCLUDES . '/includes/ui/downloads.php';
   require_once _KEYMANCOM_INCLUDES . '/includes/appstore.php';
   require_once _KEYMANCOM_INCLUDES . '/includes/playstore.php';
+  require_once _KEYMANCOM_INCLUDES . '/autoload.php';
   use Keyman\Site\Common\KeymanHosts;
   use Keyman\Site\com\keyman\Locale;
 

_content/downloads/pre-release/index.php

@@ -1,8 +1,9 @@
 <?php
   require_once _KEYMANCOM_INCLUDES . '/includes/template.php';
-  require_once _KEYMANCOM_INCLUDES . '/includes/ui/downloads.php';
+  require_once _KEYMANCOM_INCLUDES . '/autoload.php';
   use Keyman\Site\Common\KeymanHosts;
 
+  use Keyman\Site\com\keyman\DownloadUI;
   use Keyman\Site\com\keyman\Locale;
 
   Locale::definePageScope('LOCALE_DOWNLOADS', 'downloads');
@@ -46,8 +47,8 @@
 <p><a href='<?=KeymanHosts::Instance()->help_keyman_com?>/version-history'>Keyman version history</a> (all products)</p>
 
 <?php
-  downloadSection('product_windows',         'windows', 'keyman-$version.exe', 'beta alpha');
-  downloadSection('product_macos',           'mac',     'keyman-$version.dmg', 'beta alpha');
+  DownloadUI::downloadSection('windows', 'beta alpha');
+  DownloadUI::downloadSection('mac',     'beta alpha');
 ?>
 
 <h2 id='linux' class='red underline'>Keyman for Linux</h2>
@@ -64,8 +65,8 @@
 sudo apt install keyman onboard-keyman</code></pre>
 
 <?php
-  downloadSection('product_android',         'android', 'keyman-$version.apk', 'beta alpha');
-  //downloadSection('product_ios',    'ios',     'keyman-ios-$version.ipa', 'beta alpha');
+  DownloadUI::downloadSection('android', 'beta alpha');
+  //DownloadUI::downloadSection('ios',     'beta alpha');
 ?>
 
 <p>You can also <a href="https://play.google.com/apps/testing/com.tavultesoft.kmapro">sign up</a> to access pre-release versions through Google Play.</p>
@@ -74,10 +75,10 @@
 <p>Please register for the pre-release versions through the links below for Keyman <a href="https://testflight.apple.com/join/9W4XIoxQ">beta</a> or
 <a href="https://testflight.apple.com/join/vnCV2EiH">alpha</a> pre-releases on your iOS device.  This will grant access to the respective app version
 through <a href="https://developer.apple.com/testflight/testers/">Apple's TestFlight app</a>, which facilitates direct installation on iOS devices.</p>
-<?= iosTestFlightTable(); ?>
+<?= DownloadUI::iosTestFlightTable(); ?>
 
 <?php
-  downloadSection('product_keymanweb',                     'web',     'keymanweb-$version.zip', 'beta alpha');
+  DownloadUI::downloadSection('web', 'beta alpha');
 ?>
 
 <ul>
@@ -86,5 +87,5 @@
 </ul>
 
 <?php
-  downloadSection('product_developer',              'developer', array('keymandeveloper-$version.exe', 'kmcomp-$version.zip'), 'beta alpha');
+  DownloadUI::downloadSection('developer', 'beta alpha');
 ?>