gnucash-htdocs master: First test to use global-params in the docs page.

Cristian Marchi cmarchi at code.gnucash.org
Tue Dec 31 03:29:15 EST 2013


Updated	 via  https://github.com/Gnucash/gnucash-htdocs/commit/8d85eb92 (commit)
	from  https://github.com/Gnucash/gnucash-htdocs/commit/80134faa (commit)



commit 8d85eb92c93aebb968485e78c8dfa945666446ca
Author: Cristian Marchi <cri79 at libero.it>
Date:   Tue Dec 31 09:28:50 2013 +0100

    First test to use global-params in the docs page.

diff --git a/docs.phtml b/docs.phtml
index 0ae15b0..1c28801 100644
--- a/docs.phtml
+++ b/docs.phtml
@@ -32,7 +32,7 @@ include("externals/menu.phtml");
 
 <div class="featurecontainer">
 <div class="featureborder">
-<h2 class="featuretitle">GnuCash v2.6 <?=T_("(current stable release)");?></h2>
+<h2 class="featuretitle"><?php printf (T_("GnuCash v%s (current stable release)"), $major_stable)?></h2>
 </div>
 <h3><?= T_("Current <em>stable</em> user documentation and developer documentation");?></h3>
 <div id="stabledoc">
@@ -44,35 +44,35 @@ include("externals/menu.phtml");
     <tbody>
       <tr class="doctr">
       <td><?php echo T_("English");?> :</td><td>
-        <a href="<?=$top_dir;?>/viewdoc.phtml?rev=2.6&lang=C&doc=help">
+        <a href="<?=$top_dir;?>/viewdoc.phtml?rev=<?=$major_stable;?>&lang=C&doc=help">
           <img class="docicon" alt="online" title="<?php echo T_($online);?>" src="<?=$top_dir;?>/images/icons/online_logo.png" /></a> |
-        <a href="<?=$top_dir;?>/docs/v2.6/C/gnucash-help.pdf">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_stable;?>/C/gnucash-help.pdf">
           <img class="docicon" alt="pdf" title="<?php echo T_($pdf);?>" src="<?=$top_dir;?>/images/icons/pdf_logo.png" /></a> |
-        <a href="<?=$top_dir;?>/docs/v2.6/C/gnucash-help.epub">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_stable;?>/C/gnucash-help.epub">
           <img class="docicon" alt="epub" title="<?php echo T_($epub);?>" src="<?=$top_dir;?>/images/icons/epub_logo.png" /></a> |
-        <a href="<?=$top_dir;?>/docs/v2.6/C/gnucash-help.mobi">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_stable;?>/C/gnucash-help.mobi">
           <img class="docicon" alt="mobi" title="<?php echo T_($mobi);?>" src="<?=$top_dir;?>/images/icons/mobipocket_logo.png" /></a>
       </td></tr>
       <tr class="doctr">
       <td><?php echo T_("German");?> :</td><td>
-        <a href="<?=$top_dir;?>/viewdoc.phtml?rev=2.6&lang=de_DE&doc=help">
+        <a href="<?=$top_dir;?>/viewdoc.phtml?rev=<?=$major_stable;?>&lang=de_DE&doc=help">
           <img class="docicon" alt="online" title="<?php echo T_($online);?>" src="<?=$top_dir;?>/images/icons/online_logo.png" /></a> |
-        <a href="<?=$top_dir;?>/docs/v2.6/de/gnucash-help.pdf">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_stable;?>/de/gnucash-help.pdf">
           <img class="docicon" alt="pdf" title="<?php echo T_($pdf);?>" src="<?=$top_dir;?>/images/icons/pdf_logo.png" /></a> |
-        <a href="<?=$top_dir;?>/docs/v2.6/de/gnucash-help.epubf">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_stable;?>/de/gnucash-help.epubf">
           <img class="docicon" alt="epub" title="<?php echo T_($epub);?>" src="<?=$top_dir;?>/images/icons/epub_logo.png" /></a> |
-        <a href="<?=$top_dir;?>/docs/v2.6/de/gnucash-help.mobi">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_stable;?>/de/gnucash-help.mobi">
           <img class="docicon" alt="mobi" title="<?php echo T_($mobi);?>" src="<?=$top_dir;?>/images/icons/mobipocket_logo.png" /></a>
       </td></tr>
       <tr class="doctr">
       <td><?php echo T_("Italian");?> :</td><td>
-        <a href="<?=$top_dir;?>/viewdoc.phtml?rev=2.6&lang=it_IT&doc=help">
+        <a href="<?=$top_dir;?>/viewdoc.phtml?rev=<?=$major_stable;?>&lang=it_IT&doc=help">
           <img class="docicon" alt="online" title="<?php echo T_($online);?>" src="<?=$top_dir;?>/images/icons/online_logo.png" /></a> |
-        <a href="<?=$top_dir;?>/docs/v2.6/it/gnucash-help.pdf">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_stable;?>/it/gnucash-help.pdf">
           <img class="docicon" alt="pdf" title="<?php echo T_($pdf);?>" src="<?=$top_dir;?>/images/icons/pdf_logo.png" /></a> |
-        <a href="<?=$top_dir;?>/docs/v2.6/it/gnucash-help.epub">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_stable;?>/it/gnucash-help.epub">
           <img class="docicon" alt="epub" title="<?php echo T_($epub);?>" src="<?=$top_dir;?>/images/icons/epub_logo.png" /></a> |
-        <a href="<?=$top_dir;?>/docs/v2.6/it/gnucash-help.mobi">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_stable;?>/it/gnucash-help.mobi">
           <img class="docicon" alt="mobi" title="<?php echo T_($mobi);?>" src="<?=$top_dir;?>/images/icons/mobipocket_logo.png" /></a>
       </td></tr>
     </tbody>
@@ -83,46 +83,46 @@ include("externals/menu.phtml");
     <tbody>
       <tr class="doctr">
       <td><?php echo T_("English");?> :</td><td>
-        <a href="<?=$top_dir;?>/viewdoc.phtml?rev=2.6&lang=C&doc=guide">
+        <a href="<?=$top_dir;?>/viewdoc.phtml?rev=<?=$major_stable;?>&lang=C&doc=guide">
           <img class="docicon" alt="online" title="<?php echo T_($online);?>" src="<?=$top_dir;?>/images/icons/online_logo.png" /></a> |
-        <a href="<?=$top_dir;?>/docs/v2.6/C/gnucash-guide.pdf">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_stable;?>/C/gnucash-guide.pdf">
           <img class="docicon" alt="pdf" title="<?php echo T_($pdf);?>" src="<?=$top_dir;?>/images/icons/pdf_logo.png" /></a> |
-        <a href="<?=$top_dir;?>/docs/v2.6/C/gnucash-guide.epub">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_stable;?>/C/gnucash-guide.epub">
           <img class="docicon" alt="epub" title="<?php echo T_($epub);?>" src="<?=$top_dir;?>/images/icons/epub_logo.png" /></a> |
-        <a href="<?=$top_dir;?>/docs/v2.6/C/gnucash-guide.mobi">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_stable;?>/C/gnucash-guide.mobi">
           <img class="docicon" alt="mobi" title="<?php echo T_($mobi);?>" src="<?=$top_dir;?>/images/icons/mobipocket_logo.png" /></a>
       </td></tr>
       <tr class="doctr">
       <td><?php echo T_("German");?> :</td><td>
-        <a href="<?=$top_dir;?>/viewdoc.phtml?rev=2.6&lang=de_DE&doc=guide">
+        <a href="<?=$top_dir;?>/viewdoc.phtml?rev=<?=$major_stable;?>&lang=de_DE&doc=guide">
           <img class="docicon" alt="online" title="<?php echo T_($online);?>" src="<?=$top_dir;?>/images/icons/online_logo.png" /></a> |
-        <a href="<?=$top_dir;?>/docs/v2.6/de/gnucash-guide.pdf">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_stable;?>/de/gnucash-guide.pdf">
           <img class="docicon" alt="pdf" title="<?php echo T_($pdf);?>" src="<?=$top_dir;?>/images/icons/pdf_logo.png" /></a> |
-        <a href="<?=$top_dir;?>/docs/v2.6/de/gnucash-guide.epub">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_stable;?>/de/gnucash-guide.epub">
           <img class="docicon" alt="epub" title="<?php echo T_($epub);?>" src="<?=$top_dir;?>/images/icons/epub_logo.png" /></a> |
-        <a href="<?=$top_dir;?>/docs/v2.6/de/gnucash-guide.mobi">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_stable;?>/de/gnucash-guide.mobi">
           <img class="docicon" alt="mobi" title="<?php echo T_($mobi);?>" src="<?=$top_dir;?>/images/icons/mobipocket_logo.png" /></a>
       </td></tr>
       <tr class="doctr">
       <td><?php echo T_("Italian");?> :</td><td>
-        <a href="<?=$top_dir;?>/viewdoc.phtml?rev=2.6&lang=it_IT&doc=guide">
+        <a href="<?=$top_dir;?>/viewdoc.phtml?rev=<?=$major_stable;?>&lang=it_IT&doc=guide">
           <img class="docicon" alt="online" title="<?php echo T_($online);?>" src="<?=$top_dir;?>/images/icons/online_logo.png" /></a> |
-        <a href="<?=$top_dir;?>/docs/v2.6/it/gnucash-guide.pdf">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_stable;?>/it/gnucash-guide.pdf">
           <img class="docicon" alt="pdf" title="<?php echo T_($pdf);?>" src="<?=$top_dir;?>/images/icons/pdf_logo.png" /></a> |
-        <a href="<?=$top_dir;?>/docs/v2.6/it/gnucash-guide.epub">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_stable;?>/it/gnucash-guide.epub">
           <img class="docicon" alt="epub" title="<?php echo T_($epub);?>" src="<?=$top_dir;?>/images/icons/epub_logo.png" /></a> |
-        <a href="<?=$top_dir;?>/docs/v2.6/it/gnucash-guide.mobi">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_stable;?>/it/gnucash-guide.mobi">
           <img class="docicon" alt="mobi" title="<?php echo T_($mobi);?>" src="<?=$top_dir;?>/images/icons/mobipocket_logo.png" /></a>
       </td></tr>
       <tr class="doctr">
       <td><?php echo T_("Japanese");?> :</td><td>
-        <a href="<?=$top_dir;?>/viewdoc.phtml?rev=2.6&lang=ja_JP&doc=guide">
+        <a href="<?=$top_dir;?>/viewdoc.phtml?rev=<?=$major_stable;?>&lang=ja_JP&doc=guide">
           <img class="docicon" alt="online" title="<?php echo T_($online);?>" src="<?=$top_dir;?>/images/icons/online_logo.png" /></a> |
-        <a href="<?=$top_dir;?>/docs/v2.6/ja/gnucash-guide.pdf">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_stable;?>/ja/gnucash-guide.pdf">
           <img class="docicon" alt="pdf" title="<?php echo T_($pdf);?>" src="<?=$top_dir;?>/images/icons/pdf_logo.png" /></a> |
-        <a href="<?=$top_dir;?>/docs/v2.6/ja/gnucash-guide.epub">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_stable;?>/ja/gnucash-guide.epub">
           <img class="docicon" alt="epub" title="<?php echo T_($epub);?>" src="<?=$top_dir;?>/images/icons/epub_logo.png" /></a> |
-        <a href="<?=$top_dir;?>/docs/v2.6/ja/gnucash-guide.mobi">
+        <a href="<?=$top_dir;?>/docs/v<?=$major_stable;?>/ja/gnucash-guide.mobi">
           <img class="docicon" alt="mobi" title="<?php echo T_($mobi);?>" src="<?=$top_dir;?>/images/icons/mobipocket_logo.png" /></a>
       </td></tr>
     </tbody>
diff --git a/externals/global_params.php b/externals/global_params.php
index 907ba51..c83fe4b 100644
--- a/externals/global_params.php
+++ b/externals/global_params.php
@@ -2,22 +2,28 @@
      // This section defines the most recent version numbers for all platforms.
      // Each platform can define its own latest version or follow the default.
      // Both a latest stable version and a latest unstable version are defined.
-     $latest_stable             = "2.6.0";
+     $major_stable		="2.6";
+     $minor_stable		="0";
+     $latest_stable             = $major_stable.".".$minor_stable;
 #     $latest_stable_win		= $latest_stable."-1";
      $latest_stable_win         = $latest_stable;
 #     $latest_stable_mac_ppc     = $latest_stable."-2";
      $latest_stable_mac_ppc     = $latest_stable;
 #     $latest_stable_mac_intel   = $latest_stable."-2";
      $latest_stable_mac_intel   = $latest_stable;
- 
-#     $latest_unstable           = "2.5.10";
+
+#     $major_latest_unstable		="2.5";
+#     $minor_latest_unstable		="10"; 
+#     $latest_unstable           = $major_latest_unstable.".".$minor_latest_unstable;
      // There's currently no unstable release being worked on, so disable it
      $latest_unstable           = False;
      $latest_unstable_win       = $latest_unstable;
      $latest_unstable_mac_ppc   = $latest_unstable."-1";
      $latest_unstable_mac_intel = $latest_unstable."-1";
 
-     $old_stable           = "2.4.14";
+     $major_old_stable		="2.4";
+     $minor_old_stable		="14";
+     $old_stable           = $major_old_stable.".".$minor_old_stable;
      // There's currently no unstable release being worked on, so disable it
 #     $old_stable           = False;
      $old_stable_win       = $old_stable;



Summary of changes:
 docs.phtml                  |   58 +++++++++++++++++++++---------------------
 externals/global_params.php |   14 +++++++---
 2 files changed, 39 insertions(+), 33 deletions(-)



More information about the gnucash-changes mailing list