r22691 - htdocs/branches/beta - Revert "Separate unstable download information to a separate file, make"

[John Ralls]

Author: jralls
Date: 2013-01-10 22:58:01 -0500 (Thu, 10 Jan 2013)
New Revision: 22691
Trac: http://svn.gnucash.org/trac/changeset/22691

Removed:
   htdocs/branches/beta/unstable-download.phtml
Modified:
   htdocs/branches/beta/download.phtml
Log:
Revert "Separate unstable download information to a separate file, make"

Guess that didn't work, got an "internal server error".

This reverts commit 21dd9fcda9b35b6ad664aaf0048e162dba135402.

Modified: htdocs/branches/beta/download.phtml
===================================================================
--- htdocs/branches/beta/download.phtml	2013-01-10 23:40:03 UTC (rev 22690)
+++ htdocs/branches/beta/download.phtml	2013-01-11 03:58:01 UTC (rev 22691)
@@ -41,10 +41,19 @@
  </ul>
 <p><?php echo T_("For build instructions, please check the <span class=\"gnucash\">GnuCash</span> wiki which has <a href='http://wiki.gnucash.org/wiki/GnuCash#Installation'>guidelines for several distributions</a>.")?></p>
 
-<?php if ($latest_unstable)
-      include "unstable-download.phtml";
-?>
 <div class="featureborder">
+<h2 class="featuretitle"><?php printf (T_("Unstable/Development release (%s)"), $latest_unstable)?></h2>
+</div>
+<p class="justify"><?php echo T_("Unstable (development) releases are for testing purposes only. They contain the newest features and improvements, but may also contain serious bugs still. Don't install these releases for everyday use.")?></p>
+<p class="justify"><?php printf (T_("The latest unstable release of <span class=\"gnucash\">GnuCash</span> is %s.  Choose the download for your operating system below."), $latest_unstable)?></p>
+
+<ul>
+  <li><?php printf (T_("GnuCash %s for"), $latest_unstable)?> <a href="<?php echo $download_path.$latest_unstable_win;?>">Microsoft Windows XP/Vista/7</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><a href="<?php echo $download_path.$latest_unstable_source;?>">bzip2 compressed tarball</a> <?php printf (T_("for GnuCash %s"), $latest_unstable)?></li>
+</ul>
+
+<div class="featureborder">
 <h2 class="featuretitle"><?php echo T_("Other")?></h2>
 </div>
 

Deleted: htdocs/branches/beta/unstable-download.phtml
===================================================================
--- htdocs/branches/beta/unstable-download.phtml	2013-01-10 23:40:03 UTC (rev 22690)
+++ htdocs/branches/beta/unstable-download.phtml	2013-01-11 03:58:01 UTC (rev 22691)
@@ -1,12 +0,0 @@
-<div class="featureborder">
-<h2 class="featuretitle"><?php printf (T_("Unstable/Development release (%s)"), $latest_unstable)?></h2>
-</div>
-<p class="justify"><?php echo T_("Unstable (development) releases are for testing purposes only. They contain the newest features and improvements, but may also contain serious bugs still. Don't install these releases for everyday use.")?></p>
-<p class="justify"><?php printf (T_("The latest unstable release of <span class=\"gnucash\">GnuCash</span> is %s.  Choose the download for your operating system below."), $latest_unstable)?></p>
-
-<ul>
-  <li><?php printf (T_("GnuCash %s for"), $latest_unstable)?> <a href="<?php echo $download_path.$latest_unstable_win;?>">Microsoft Windows XP/Vista/7</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><a href="<?php echo $download_path.$latest_unstable_source;?>">bzip2 compressed tarball</a> <?php printf (T_("for GnuCash %s"), $latest_unstable)?></li>
-</ul>
-