gnucash-htdocs master: Minor Fixes of previous commit, announce no longer supported versions

[Frank H.Ellenberger]

Updated	 via  https://github.com/Gnucash/gnucash-htdocs/commit/5da732a9 (commit)
	from  https://github.com/Gnucash/gnucash-htdocs/commit/d7ffa73c (commit)



commit 5da732a97347bbacfef8b9620204b0aeaa5e675c
Author: fell <frank.h.ellenberger at gmail.com>
Date:   Tue Apr 3 09:45:23 2018 +0200

    Minor Fixes of previous commit, announce no longer supported versions

diff --git a/download.phtml b/download.phtml
index 4bbc971..d24091e 100644
--- a/download.phtml
+++ b/download.phtml
@@ -67,7 +67,7 @@ if ($old_stable) { ?>
 <p class="justify"><?php printf (T_("The last old stable release of <span class=\"gnucash\">GnuCash</span> is %s.  Choose the download for your operating system below."), $old_stable)?></p>
 
 <ul>
-  <li><?php printf (T_("GnuCash %s for"), $old_stable)?> <a href="<?php echo $download_path.$old_stable_win;?>">Microsoft Windows XP/Vista/7/8</a></li>
+  <li><?php printf (T_("GnuCash %s for"), $old_stable)?> <a href="<?php echo $download_path.$old_stable_win;?>">Microsoft Windows XP/Vista/7/8/10</a></li>
   <li><?php printf (T_("GnuCash %s for"), $old_stable)?> Mac OS X <a href="<?php echo $download_path.$old_stable_mac_intel;?>">Intel</a> | <a href="<?php echo $download_path.$old_stable_mac_ppc;?>">PPC</a></li>
   <li><a href="<?php echo $download_path.$old_stable_source;?>">bzip2 compressed tarball</a> <?php printf (T_("for GnuCash %s"), $old_stable)?></li>
 </ul>
diff --git a/externals/global_params.php b/externals/global_params.php
index a9964e7..a6ec565 100644
--- a/externals/global_params.php
+++ b/externals/global_params.php
@@ -7,7 +7,6 @@
      $latest_stable             = $major_stable.".".$minor_stable;
      $latest_stable_win		= $latest_stable;
 #     $latest_stable_win         = $latest_stable."-1";
-     $latest_stable_mac_ppc     = $latest_stable."-1";
      $latest_stable_mac_intel   = $latest_stable."-1";
 // Change this when there has been a re-tag to add the re-tag letter,
 // e.g. if one retagged 2.6.13 to 2.6.13a, make $tarball = $latest_stable."a".
@@ -30,7 +29,8 @@
      $old_stable            = $major_old_stable.".".$minor_old_stable;
      $old_stable_win        = $old_stable;
      $latest_stable_xp_vista = $old_stable;
-     $latest_stable_mac_ppc  = $old_stable;
+     $latest_stable_mac_ppc  = $old_stable."-1";
+     $old_stable_mac_ppc  = $old_stable."-1";
      $old_stable_mac_intel  = $old_stable."-1";
 
      // The definitions below use the latest version definitions above
@@ -58,7 +58,6 @@
      
      $latest_unstable_win="gnucash-".$latest_unstable_win."-setup.exe";
      $latest_unstable_mac_intel="Gnucash Intel ".$latest_unstable_mac_intel.".dmg";
-     $latest_unstable_mac_ppc="Gnucash-PPC-".$latest_unstable_mac_ppc.".dmg";
      $latest_unstable_source="gnucash-".$latest_unstable.".tar.bz2";
      
      $download_path="http://downloads.sourceforge.net/sourceforge/gnucash/";
diff --git a/index.phtml b/index.phtml
index 77fd66d..523781c 100644
--- a/index.phtml
+++ b/index.phtml
@@ -15,15 +15,16 @@ include("externals/menu.phtml");
 
 <div id="download">
 <div style="float:left;">
-<h2 id="dwnld-box"><?php printf (T_("Download GnuCash %s"), $latest_stable)?></h2>
-<h3><a style="margin-left:10px" href="2.6-release-tour.phtml"><em><?php echo T_("GnuCash 2.6 release tour")?></em></a></h3>
+ <h2 id="dwnld-box"><?php printf (T_("Download GnuCash %s"), $latest_stable)?></h2>
+ <h3><a style="margin-left:10px" href="2.6-release-tour.phtml"><em><?php echo T_("GnuCash 2.6 release tour")?></em></a></h3>
 
-<ul>
-<li><img alt="linux" src="<?=$top_dir?>/images/icons/linux.png" /> Linux <a href="<?php echo $download_path.$latest_stable_source;?>"><?php echo T_("Source");?></a> | <a href="<?=$home?>/download.phtml#distribution"><?php echo T_("Via distribution");?></a></li>
-<li><img alt="windows" src="<?=$top_dir?>/images/icons/windows.png" /> Microsoft Windows <a href="<?php echo $download_path.$latest_stable_xp_vista;?>">XP/Vista</a></li> | <a href="<?php echo $download_path.$latest_stable_win;?>">7/8/10</a>
-<li><img alt="macosx" src="<?=$top_dir?>/images/icons/macosx.png" /> Mac OS X <a href="<?php echo $download_path.$latest_stable_mac_intel;?>">Intel</a> | <a href="<?php echo $download_path.$latest_stable_mac_ppc;?>">Power PC</a></li>
-<li><a href="<?=$home?>/download.phtml" style="font-size: 80%;"><?=T_("More downloads (Source, Development,...)")?></a></li>
-</ul>
+ <ul>
+  <li><img alt="linux" src="<?=$top_dir?>/images/icons/linux.png" /> Linux <a href="<?php echo $download_path.$latest_stable_source;?>"><?php echo T_("Source");?></a> | <a href="<?=$home?>/download.phtml#distribution"><?php echo T_("Via distribution");?></a></li>
+  <li><img alt="windows" src="<?=$top_dir?>/images/icons/windows.png" /> Microsoft Windows <a href="<?php echo $download_path.$latest_stable_xp_vista;?>">XP/Vista</a></li> | <a href="<?php echo $download_path.$latest_stable_win;?>">7/8/10</a>
+  <li><img alt="macosx" src="<?=$top_dir?>/images/icons/macosx.png" /> Mac OS X <a href="<?php echo $download_path.$latest_stable_mac_intel;?>">Intel</a> | <a href="<?php echo $download_path.$latest_stable_mac_ppc;?>">Power PC</a></li>
+  <li><a href="<?=$home?>/download.phtml" style="font-size: 80%;"><?=T_("More downloads (Source, Development,...)")?></a></li>
+ </ul>
+ <p class="justify"><?php echo T_("Goodbye! <span class=\"gnucash\">GnuCash</span> 2.6.20 is the last version for Windows XP/Vista and MacOS X 10.8 and earlier, and so the last version that will run on PowerPC Macs.");?></p>
 </div>
 
 <div class="downloadimage">



Summary of changes:
 download.phtml              |  2 +-
 externals/global_params.php |  5 ++---
 index.phtml                 | 17 +++++++++--------
 3 files changed, 12 insertions(+), 12 deletions(-)