gnucash-htdocs master: Multiple changes pushed
John Ralls
jralls at code.gnucash.org
Tue Dec 31 17:59:13 EST 2013
Updated via https://github.com/Gnucash/gnucash-htdocs/commit/41a8528d (commit)
via https://github.com/Gnucash/gnucash-htdocs/commit/52d5a5e4 (commit)
from https://github.com/Gnucash/gnucash-htdocs/commit/08a7dfbb (commit)
commit 41a8528dfd9fab4138bceebdfc8ddd9fd5dee9a0
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Dec 31 14:58:31 2013 -0800
Fix Mac Intel D/L link, add one for PPC.
diff --git a/news/131230-2.6.0.news b/news/131230-2.6.0.news
index a161fae..898a39c 100644
--- a/news/131230-2.6.0.news
+++ b/news/131230-2.6.0.news
@@ -9,7 +9,7 @@
<p>The <a href="http://downloads.sourceforge.net/sourceforge/gnucash/gnucash-2.6.0-setup.exe">Gnucash 2.6.0 Win32 setup executable</a> can be downloaded from Sourceforge. It will install everything needed to run GnuCash.</p>
<h3>Mac OSX binary</h3>
-<p>The <a href="http://downloads.sourceforge.net/sourceforge/gnucash/Gnucash-Intel-2.6.0.dmg">Gnucash 2.6.0 MacOSX package</a> can be downloaded from Sourceforge as well.</p>
+<p>The Gnucash 2.6.0 MacOS X <a href="http://downloads.sourceforge.net/sourceforge/gnucash/Gnucash-Intel-2.6.0-1.dmg">Intel</a> and <a href="http://downloads.sourceforge.net/sourceforge/gnucash/Gnucash-PPC-2.6.0-1.dmg">PPC</a> packages can be downloaded from Sourceforge as well.</p>
<h3>Getting GnuCash as source code</h3>
<p>If you want to compile GnuCash 2.6.0 for yourself, the source code can be downloaded from:</p>
commit 52d5a5e444d766b650d6e816088905eba1e0757c
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Dec 31 14:54:51 2013 -0800
Remove references to MacOSX Readme wiki articles
No longer needed.
diff --git a/download.phtml b/download.phtml
index 79752e3..b6ce04b 100644
--- a/download.phtml
+++ b/download.phtml
@@ -20,7 +20,7 @@ include("externals/menu.phtml");
<h3><?php echo T_("Installers")?></h3>
<ul class="imagelist">
<li class="imagelistitem" style="background-image: url(<?=$top_dir?>/images/icons/windows.png);"><?php printf (T_("GnuCash %s for"), $latest_stable)?> <a href="<?php echo $download_path.$latest_stable_win;?>">Microsoft Windows XP/Vista/7/8</a></li>
-<li class="imagelistitem" style="background-image: url(<?=$top_dir?>/images/icons/macosx.png);"><?php printf (T_("GnuCash %s for"), $latest_stable)?> 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> | <a href="http://wiki.gnucash.org/wiki/MacOSX/<?php echo $latest_stable;?>/Readme">Readme</a></li>
+<li class="imagelistitem" style="background-image: url(<?=$top_dir?>/images/icons/macosx.png);"><?php printf (T_("GnuCash %s for"), $latest_stable)?> 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>
</ul>
<a id="distribution"></a><h3>Linux</h3>
@@ -52,7 +52,7 @@ if ($latest_unstable) { ?>
<ul>
<li><?php printf (T_("GnuCash %s for"), $latest_unstable)?> <a href="<?php echo $download_path.$latest_unstable_win;?>">Microsoft Windows XP/Vista/7/8</a></li>
- <li><?php printf (T_("GnuCash %s for"), $latest_unstable)?> Mac OS X <a href="<?php echo $download_path.$latest_unstable_mac_intel;?>">Intel</a> | <a href="<?php echo $download_path.$latest_unstable_mac_ppc;?>">PPC</a> | <a href="http://wiki.gnucash.org/wiki/MacOSX/<?php echo $latest_unstable;?>/Readme">Readme</a></li>
+ <li><?php printf (T_("GnuCash %s for"), $latest_unstable)?> Mac OS X <a href="<?php echo $download_path.$latest_unstable_mac_intel;?>">Intel</a> | <a href="<?php echo $download_path.$latest_unstable_mac_ppc;?>">PPC</a> </li>
<li><a href="<?php echo $download_path.$latest_unstable_source;?>">bzip2 compressed tarball</a> <?php printf (T_("for GnuCash %s"), $latest_unstable)?></li>
</ul>
<?php } ?>
@@ -68,7 +68,7 @@ if ($old_stable) { ?>
<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)?> 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> | <a href="http://wiki.gnucash.org/wiki/MacOSX/<?php echo $old_stable;?>/Readme">Readme</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>
<?php } ?>
diff --git a/index.phtml b/index.phtml
index 4704c87..92d8711 100644
--- a/index.phtml
+++ b/index.phtml
@@ -20,7 +20,7 @@ include("externals/menu.phtml");
<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_win;?>">XP/Vista/7/8</a></li>
-<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> | <a href="http://wiki.gnucash.org/wiki/MacOSX/<?php echo $latest_stable;?>/Readme">Readme</a></li>
+<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>
</div>
diff --git a/osx_readme.phtml b/osx_readme.phtml
deleted file mode 100644
index fbd980a..0000000
--- a/osx_readme.phtml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
- // This script will fetch the Mac OS X readme file from sourceforge.net
- // parameters:
- // branch: 'stable' or 'unstable'
- // version: Gnucash version for which to get the Readme file (eg '2.3.7')
-
- include("externals/global_params.php");
-
- $branch = $_GET['branch'];
- if (($branch!="stable") && ($branch!="unstable")) {
- $branch="stable";
- }
-
- $readme_path="http://downloads.sourceforge.net/project/gnucash/gnucash%20(".$branch.")/";
-
- $readme_file="Gnucash%20OSX%20Readme.html";
- if ($branch === "unstable") {
- $readme_file="Gnucash%20Unstable%20OSX%20Readme.html";
- }
-
- $version=$_GET['version'];
- if (! preg_match('/^[0-9]+\.[0-9]+\.[0-9]+$/',$version)) {
- $version=$latest_stable;
- }
-
- $location=$readme_path.$version."/".$readme_file;
-// echo $location;
- header("Location: ".$location);
- exit;
-?>
\ No newline at end of file
Summary of changes:
download.phtml | 6 +++---
index.phtml | 2 +-
news/131230-2.6.0.news | 2 +-
osx_readme.phtml | 30 ------------------------------
4 files changed, 5 insertions(+), 35 deletions(-)
delete mode 100644 osx_readme.phtml
More information about the gnucash-changes
mailing list