gnucash-htdocs beta: Multiple changes pushed
Frank H.Ellenberger
fell at code.gnucash.org
Sat Oct 10 06:31:28 EDT 2020
Updated via https://github.com/Gnucash/gnucash-htdocs/commit/334d1ab0 (commit)
via https://github.com/Gnucash/gnucash-htdocs/commit/b9e388ae (commit)
via https://github.com/Gnucash/gnucash-htdocs/commit/ae6e4e7e (commit)
from https://github.com/Gnucash/gnucash-htdocs/commit/4f6b8c07 (commit)
commit 334d1ab05b7f2d366253e7719fb868ff3e6f86d7
Merge: ae6e4e7 b9e388a
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Sat Oct 10 12:28:55 2020 +0200
Merge branch 'master' into beta
commit b9e388aec19c601a339a06dec47947ded7cfc6ac
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Sat Oct 10 12:20:28 2020 +0200
viewdoc: replace undefined target attribute _new by _blank
The purpose is to show the content in a new tab or window
diff --git a/viewdoc.phtml b/viewdoc.phtml
index 182c957..dc3d1f1 100644
--- a/viewdoc.phtml
+++ b/viewdoc.phtml
@@ -155,7 +155,7 @@ if ($showrev == "maint") {
<?php } ?>
<iframe src="<?php echo $showurl; ?>" style="border-width: 0px; width: 100%; min-width: 700px; height: 80em;">
- <?php printf (T_("It seems your browser doesn't support iframes. To view the requested page in a separate window, please <a href=\"%s\" target=\"_new\">click here</a>."), $showurl); ?>
+ <?php printf (T_("It seems your browser doesn't support iframes. To view the requested page in a separate window, please <a href=\"%s\" target=\"_blank\">click here</a>."), $showurl); ?>
</iframe>
</div>
commit ae6e4e7efa6e60fedd2dc92a6b38c5ca956f1029
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Sat Oct 10 12:14:29 2020 +0200
Set individual URLs in ogp
diff --git a/develdocs.phtml b/develdocs.phtml
index 6bc4738..f62bebf 100644
--- a/develdocs.phtml
+++ b/develdocs.phtml
@@ -1,8 +1,9 @@
<?php
+include("emulate_globals_on.php");
include("lang.php");
$title = T_("Writing Documentation");
$description = T_("If you are interested in improving the <span class=\"gnucash\">GnuCash</span> documentation, you have come to the right place. This page will provide you with the necessary information to get started.");
-include("emulate_globals_on.php");
+$page = $_SERVER['PHP_SELF'];
include("externals/header.phtml");
include("externals/menu.phtml");
?>
diff --git a/donate.phtml b/donate.phtml
index 3d30b72..c492eb3 100644
--- a/donate.phtml
+++ b/donate.phtml
@@ -1,8 +1,9 @@
<?php
+ include ("emulate_globals_on.php");
include ("lang.php");
$title = T_ ( "Donations" );
$description = T_("<span class=\"gnucash\">GnuCash</span> is Free Software and is made available free of charge. Your donation, which is purely optional, supports our worldwide community. If you like the software, please consider a donation. We are only a handfull of developers and other volunteers serving countless users worldwide.");
- include ("emulate_globals_on.php");
+ $page = $_SERVER['PHP_SELF'];
include ("externals/header.phtml");
include ("externals/menu.phtml");
?>
diff --git a/download.phtml b/download.phtml
index d2f7348..8de01fe 100644
--- a/download.phtml
+++ b/download.phtml
@@ -4,6 +4,7 @@
include("lang.php");
$title = T_("Download");
$description = T_("Download executable bundles of the <span class=\"gnucash\">GnuCash</span> program inclusive documentation or the source files here. Several versions are available for recent and older operating systems.");
+ $page = $_SERVER['PHP_SELF'];
include("externals/header.phtml");
include("externals/menu.phtml");
?>
diff --git a/externals/global_params.php b/externals/global_params.php
index 50e1e52..086ad12 100644
--- a/externals/global_params.php
+++ b/externals/global_params.php
@@ -74,6 +74,7 @@
$URL_WIKI="https://wiki.gnucash.org/wiki/";
// some defaults for metatags in case the page does not set them
+ $default_url= "https://www.gnucash.org/";
$default_title= T_ ( "Free Accounting Software" );
$default_description= T_("<span class=\"gnucash\">GnuCash</span> is personal and small-business financial-accounting software, freely licensed under the <a href=\"https://www.gnu.org/\">GNU</a> GPL and available for GNU/Linux, BSD, Solaris, Mac OS X and Microsoft Windows.");
?>
diff --git a/externals/header.phtml b/externals/header.phtml
index 3b61f81..08904cc 100644
--- a/externals/header.phtml
+++ b/externals/header.phtml
@@ -61,8 +61,8 @@
?>
<meta property="og:title" content="<?=$full_title?>"/>
<meta property="og:type" content="website"/>
- <meta property="og:url" content="https://www.gnucash.org/"/>
- <meta property="og:image" content="https://www.gnucash.org/externals/logo_w120.png"/>
+ <meta property="og:url" content="<?=$default_url.$page?>"/>
+ <meta property="og:image" content="<?=$default_url."externals/logo_w120.png"?>"/>
<meta property="og:site_name" content="GnuCash"/>
<meta property="og:description" content="<?=strip_tags($description)?>"/>
<!--end of Open Graph properties-->
diff --git a/features.phtml b/features.phtml
index 8f0a656..3a07c7c 100644
--- a/features.phtml
+++ b/features.phtml
@@ -1,10 +1,11 @@
<?php
-include("lang.php");
-$title = T_("Features");
-$description = T_("<span class=\"gnucash\">GnuCash</span> is powerful accounting software. Below are details of some of the numerous features that <span class=\"gnucash\">GnuCash</span> has to offer to its users.");
-include("emulate_globals_on.php");
-include("$top_dir/externals/header.phtml");
-include("$top_dir/externals/menu.phtml");
+ include("emulate_globals_on.php");
+ include("lang.php");
+ $title = T_("Features");
+ $description = T_("<span class=\"gnucash\">GnuCash</span> is powerful accounting software. Below are details of some of the numerous features that <span class=\"gnucash\">GnuCash</span> has to offer to its users.");
+ $page = $_SERVER['PHP_SELF'];
+ include("$top_dir/externals/header.phtml");
+ include("$top_dir/externals/menu.phtml");
?>
<div id="content">
diff --git a/index.phtml b/index.phtml
index bb85157..998ff5b 100644
--- a/index.phtml
+++ b/index.phtml
@@ -2,6 +2,8 @@
$homepage = true;
include ("emulate_globals_on.php");
include ("lang.php");
+$page = $_SERVER['PHP_SELF'];
+// ^ alternate: __FILE__;
include ("externals/header.phtml");
include ("externals/menu.phtml");
?>
diff --git a/new_features-4.0.phtml b/new_features-4.0.phtml
index 415fb5e..01a3b4d 100644
--- a/new_features-4.0.phtml
+++ b/new_features-4.0.phtml
@@ -1,139 +1,140 @@
<?php
-include("lang.php");
-$title = T_("Features");;
-$description = sprintf (T_("What's New in GnuCash %s"),"4.0");
-include("emulate_globals_on.php");
-include("$top_dir/externals/header.phtml");
-include("$top_dir/externals/menu.phtml");
+ include("emulate_globals_on.php");
+ include("lang.php");
+ $title = T_("Features");;
+ $description = sprintf (T_("What's New in GnuCash %s"),"4.0");
+ $page = $_SERVER['PHP_SELF'];
+ include("$top_dir/externals/header.phtml");
+ include("$top_dir/externals/menu.phtml");
?>
<div id="content">
- <h1><?$description?></h1>
+ <h1><?$description?></h1>
- <div class="featurecontainer">
- <div class="featureborder">
- <h2 class="featuretitle"><?php echo T_("Major Highlights");?></h2>
- </div>
- <div class="row">
- <img class="featureimage"
- src="<?=$top_dir?>/images/4.0-release/trans-assoc.png"
- alt="[Transaction Association Dialog]"/>
- <div class="center">
- <ul>
- <li><?php echo T_("A new <b>Transaction Association</b> dialog, available from the <b>Update Association for Transaction</b> menu item that has replaced the two association items in 3.x, allows setting, changing, and deleting associations.");?></li>
- <li><?php echo T_("A symbol (paperclip for files, chain links for URLS) is now displayed in the Associations column (visible in double-line mode) in the register in place of the letters when a transaction has an association. This doesn't work on MacOS.");?></li>
- <li><?php echo T_("Associations may now be added to bills, credit notes, invoices, and vouchers. The actual association when present is added as a link button which is shown below the notes.");?> </li>
- </ul>
- </div>
- </div>
- <div class="row">
- <video class="featureimage" controls>
- <source src="<?=$top_dir?>/images/4.0-release/select_account.mp4" type="video/mp4">
- <source src="<?=$top_dir?>/images/4.0-release/select_account.webm" type="video/webm">
- <?php echo T_("[Video showing two ways to filter accounts]");?>
- </video>
- <p class="justify">
- <ul>
- <li><?php echo T_("New type-ahead search is added to sequential search when selecting an account or an Action in the register: Instead of typing the first few characters of a top level account, the separator, the first few characters of the next level account and so on you may instead type a few characters of any part of a full account name and the drop-list will be filtered to contain only matching accounts. Once you have a small enough list you can use the arrow keys to select the account that you want.");?></li>
- </ul></p>
- </div>
- <div class="row">
- <img class="featureimage" src="<?=$top_dir?>/images/4.0-release/gnucash-cli.png" alt="Command-Line" />
- <p class="justify"><?php echo T_("A new separate executable, <kbd>gnucash-cli</kbd> (<kbd>gnucash-cli.exe</kbd> on Microsoft Windows) for doing command-line things like updating the prices in your book. <kbd>gnucash-cli</kbd> gains the ability to run reports from the command line. Specify reports to run by name or guid. It also provides an export format and an output file name without which it will output the report to stdout.");?>
- <ul>
- <li><code>gnucash-cli --report run --name=[reportname/guid] datafile.gnucash</code></li>
- <li><code>gnucash-cli --report run --name=[reportname/guid] --output-file=x.html datafile.gnucash</code></li>
- <li><code>gnucash-cli --report run --name=[reportname/guid] --output-file=x.html --export-type=TYPE datafile.gnucash</code></li>
- </ul></p>
- <p class="justify"><kbd>gnucash-cli --help</kbd> <?php echo T_("will display a screen listing all of the available commands and their options.");?></p>
- <p><?php echo T_("The GUI program, <kbd>gnucash</kbd>, still responds to the options it always has, though <kbd>--get-price-quotes</kbd> is deprecated in favor of <kbd>gnucash-cli --quotes get</kbd>.");?></p>
- </div>
+ <div class="featurecontainer">
+ <div class="featureborder">
+ <h2 class="featuretitle"><?php echo T_("Major Highlights");?></h2>
</div>
- <div class="featurecontainer">
- <div class="featureborder">
- <h2 class="featuretitle"><?php echo T_("Graphic User Interface");?></h2>
- </div>
- <p>
- <ul>
- <li><p><?php echo T_("When creating a new account hierarchy it's now possible to load account templates from locales other than the one set for the user interface.");?></p>
- <p><?php echo T_("On the <b>Choose Accounts to Create</b> page there are two drop-downs above the <b>Account Types</b> selector, one for language and one for country, the choices in the latter depending on the former. The default is the current locale but they may be used to select account templates from any locale.");?></p>
- </li>
- <li><?php echo T_("When deleting accounts the destination accounts of moved splits will be checked to ensure that they have the same commodity as the source account. If they don't you'll get a warning and the opportunity to pick another account or to carry on regardless.");?></li>
- <li><?php echo T_("Reversing transactions will now pop a dialog box to request a posting date.");?></li>
- </ul>
- </p>
- </div>
-
- <div class="featurecontainer">
- <div class="featureborder">
- <h2 class="featuretitle"><?php echo T_("Business Functions");?></h2>
- </div>
+ <div class="row">
+ <img class="featureimage"
+ src="<?=$top_dir?>/images/4.0-release/trans-assoc.png"
+ alt="[Transaction Association Dialog]"/>
+ <div class="center">
<ul>
- <li><?php echo T_("Business Document Column Widths");?>
- <p><?php echo T_("Entry column widths in Invoices, Bills, and Employee Vouchers may now be saved as defaults for each type of document.");?></p></li>
- <li><?php echo T_("Two menu items are added to the View menu when a Bill, Invoice, or Voucher tab has focus:");?>
- <ul>
- <li><?php echo T_("Use as Default Layout for Vendor Documents");?></li>
- <li><?php echo T_("Reset Default Layout for Vendor Documents");?></li>
- </ul><?php echo T_("Vendor Documents is for Bills and is replaced by Customer or Employee Documents for Invoices or Vouchers respectively.");?>
- </li>
- <li><?php echo T_("The first saves the current document's column widths and makes them the default for all documents in the same type. The second menu item removes the customization and documents of that type will therafter use the computed default widths.");?>
- </li>
+ <li><?php echo T_("A new <b>Transaction Association</b> dialog, available from the <b>Update Association for Transaction</b> menu item that has replaced the two association items in 3.x, allows setting, changing, and deleting associations.");?></li>
+ <li><?php echo T_("A symbol (paperclip for files, chain links for URLS) is now displayed in the Associations column (visible in double-line mode) in the register in place of the letters when a transaction has an association. This doesn't work on MacOS.");?></li>
+ <li><?php echo T_("Associations may now be added to bills, credit notes, invoices, and vouchers. The actual association when present is added as a link button which is shown below the notes.");?> </li>
</ul>
+ </div>
</div>
- <div class="featurecontainer">
- <div class="featureborder">
- <h2 class="featuretitle"><?php echo T_("Importing Transactions");?></h2>
- </div>
+ <div class="row">
+ <video class="featureimage" controls>
+ <source src="<?=$top_dir?>/images/4.0-release/select_account.mp4" type="video/mp4">
+ <source src="<?=$top_dir?>/images/4.0-release/select_account.webm" type="video/webm">
+ <?php echo T_("[Video showing two ways to filter accounts]");?>
+ </video>
+ <p class="justify">
<ul>
- <li><?php echo T_("Support for AQBanking Version 6. This is required to support new FinTS protocols for the European Payment Services Directive (PSD2).");?></li>
- <li><?php echo T_("The <b>Import Map Editor</b> (Tools>Edit Import Maps) will scan for Bayesian associations with non-existent accounts and display a dialog offering to remove any that are found. It also adds a button at the bottom of the Import Map Editor to delete them if one chooses not to use the dialog.");?></li>
- <li><?php echo T_("The OFX file importer can now import more than one file at a time.");?></li>
- <li><?php echo T_("OFX imports having balance information will now offer to immediately reconcile, passing the balance information in the file to the reconcile info.");?></li>
- <li><?php echo T_("The import transaction matcher window column headings are changed from R to C and from U+R to U+C, reflecting that the matcher marks transactions cleared but doesn't reconcile them.");?></li>
- <li><?php echo T_("Account matcher will decline to match accounts with a different commodity from the imported split if the import information includes the commodity.");?></li>
- <li><?php echo T_("Ellipsize the Description and Memo fields in the account matcher.");?></li>
- </ul>
+ <li><?php echo T_("New type-ahead search is added to sequential search when selecting an account or an Action in the register: Instead of typing the first few characters of a top level account, the separator, the first few characters of the next level account and so on you may instead type a few characters of any part of a full account name and the drop-list will be filtered to contain only matching accounts. Once you have a small enough list you can use the arrow keys to select the account that you want.");?></li>
+ </ul></p>
</div>
- <div class="featurecontainer">
- <div class="featureborder">
- <h2 class="featuretitle"><?php echo T_("Reports");?></h2>
- </div>
+ <div class="row">
+ <img class="featureimage" src="<?=$top_dir?>/images/4.0-release/gnucash-cli.png" alt="Command-Line" />
+ <p class="justify"><?php echo T_("A new separate executable, <kbd>gnucash-cli</kbd> (<kbd>gnucash-cli.exe</kbd> on Microsoft Windows) for doing command-line things like updating the prices in your book. <kbd>gnucash-cli</kbd> gains the ability to run reports from the command line. Specify reports to run by name or guid. It also provides an export format and an output file name without which it will output the report to stdout.");?>
<ul>
- <li><?php echo T_("A new report menu supbmenu <b>Multicolumn</b> contains the old custom-multicolumn report and a new <b>Dashboard</b> report containing Account reports for expenses and income, an income-expense chart, and an account summary.");?></li>
- <li><?php echo T_("Support for UK VAT and Australian GST have been added to the Income-GST report. The report's options are changed from source accounts to source sales and purchase accounts to permit proper reporting of capital purchases. <b>N.B.</b> This is incompatible with previous versions of the report and will require regenerating saved configurations.");?></li>
- </ul>
+ <li><code>gnucash-cli --report run --name=[reportname/guid] datafile.gnucash</code></li>
+ <li><code>gnucash-cli --report run --name=[reportname/guid] --output-file=x.html datafile.gnucash</code></li>
+ <li><code>gnucash-cli --report run --name=[reportname/guid] --output-file=x.html --export-type=TYPE datafile.gnucash</code></li>
+ </ul></p>
+ <p class="justify"><kbd>gnucash-cli --help</kbd> <?php echo T_("will display a screen listing all of the available commands and their options.");?></p>
+ <p><?php echo T_("The GUI program, <kbd>gnucash</kbd>, still responds to the options it always has, though <kbd>--get-price-quotes</kbd> is deprecated in favor of <kbd>gnucash-cli --quotes get</kbd>.");?></p>
</div>
- <div class="featurecontainer">
- <div class="featureborder">
- <h2 class="featuretitle"><?php echo T_("Budgets");?></h2>
- </div>
- <ul>
- <li><?php echo T_("Optionally include the account code option in budget view.");?></li>
- <li><?php echo T_("Enable adding notes to budgets.");?></li>
- <li><?php echo T_("Account codes may now optionally be displayed in the Budget Tree View..");?></li>
- </ul>
+ </div>
+ <div class="featurecontainer">
+ <div class="featureborder">
+ <h2 class="featuretitle"><?php echo T_("Graphic User Interface");?></h2>
+ </div>
+ <p>
+ <ul>
+ <li><p><?php echo T_("When creating a new account hierarchy it's now possible to load account templates from locales other than the one set for the user interface.");?></p>
+ <p><?php echo T_("On the <b>Choose Accounts to Create</b> page there are two drop-downs above the <b>Account Types</b> selector, one for language and one for country, the choices in the latter depending on the former. The default is the current locale but they may be used to select account templates from any locale.");?></p>
+ </li>
+ <li><?php echo T_("When deleting accounts the destination accounts of moved splits will be checked to ensure that they have the same commodity as the source account. If they don't you'll get a warning and the opportunity to pick another account or to carry on regardless.");?></li>
+ <li><?php echo T_("Reversing transactions will now pop a dialog box to request a posting date.");?></li>
+ </ul>
+ </p>
+ </div>
+
+ <div class="featurecontainer">
+ <div class="featureborder">
+ <h2 class="featuretitle"><?php echo T_("Business Functions");?></h2>
</div>
- <div class="featurecontainer">
- <div class="featureborder">
- <h2 class="featuretitle"><?php echo T_("Compatibility");?></h2>
- </div>
+ <ul>
+ <li><?php echo T_("Business Document Column Widths");?>
+ <p><?php echo T_("Entry column widths in Invoices, Bills, and Employee Vouchers may now be saved as defaults for each type of document.");?></p></li>
+ <li><?php echo T_("Two menu items are added to the View menu when a Bill, Invoice, or Voucher tab has focus:");?>
<ul>
- <li><?php echo T_("GnuCash 4.x and later will no longer migrate old gconf settings from GnuCash 2.4.x.");?></li>
- </ul>
+ <li><?php echo T_("Use as Default Layout for Vendor Documents");?></li>
+ <li><?php echo T_("Reset Default Layout for Vendor Documents");?></li>
+ </ul><?php echo T_("Vendor Documents is for Bills and is replaced by Customer or Employee Documents for Invoices or Vouchers respectively.");?>
+ </li>
+ <li><?php echo T_("The first saves the current document's column widths and makes them the default for all documents in the same type. The second menu item removes the customization and documents of that type will therafter use the computed default widths.");?>
+ </li>
+ </ul>
+ </div>
+ <div class="featurecontainer">
+ <div class="featureborder">
+ <h2 class="featuretitle"><?php echo T_("Importing Transactions");?></h2>
+ </div>
+ <ul>
+ <li><?php echo T_("Support for AQBanking Version 6. This is required to support new FinTS protocols for the European Payment Services Directive (PSD2).");?></li>
+ <li><?php echo T_("The <b>Import Map Editor</b> (Tools>Edit Import Maps) will scan for Bayesian associations with non-existent accounts and display a dialog offering to remove any that are found. It also adds a button at the bottom of the Import Map Editor to delete them if one chooses not to use the dialog.");?></li>
+ <li><?php echo T_("The OFX file importer can now import more than one file at a time.");?></li>
+ <li><?php echo T_("OFX imports having balance information will now offer to immediately reconcile, passing the balance information in the file to the reconcile info.");?></li>
+ <li><?php echo T_("The import transaction matcher window column headings are changed from R to C and from U+R to U+C, reflecting that the matcher marks transactions cleared but doesn't reconcile them.");?></li>
+ <li><?php echo T_("Account matcher will decline to match accounts with a different commodity from the imported split if the import information includes the commodity.");?></li>
+ <li><?php echo T_("Ellipsize the Description and Memo fields in the account matcher.");?></li>
+ </ul>
+ </div>
+ <div class="featurecontainer">
+ <div class="featureborder">
+ <h2 class="featuretitle"><?php echo T_("Reports");?></h2>
+ </div>
+ <ul>
+ <li><?php echo T_("A new report menu supbmenu <b>Multicolumn</b> contains the old custom-multicolumn report and a new <b>Dashboard</b> report containing Account reports for expenses and income, an income-expense chart, and an account summary.");?></li>
+ <li><?php echo T_("Support for UK VAT and Australian GST have been added to the Income-GST report. The report's options are changed from source accounts to source sales and purchase accounts to permit proper reporting of capital purchases. <b>N.B.</b> This is incompatible with previous versions of the report and will require regenerating saved configurations.");?></li>
+ </ul>
+ </div>
+ <div class="featurecontainer">
+ <div class="featureborder">
+ <h2 class="featuretitle"><?php echo T_("Budgets");?></h2>
</div>
+ <ul>
+ <li><?php echo T_("Optionally include the account code option in budget view.");?></li>
+ <li><?php echo T_("Enable adding notes to budgets.");?></li>
+ <li><?php echo T_("Account codes may now optionally be displayed in the Budget Tree View..");?></li>
+ </ul>
+ </div>
+ <div class="featurecontainer">
+ <div class="featureborder">
+ <h2 class="featuretitle"><?php echo T_("Compatibility");?></h2>
+ </div>
+ <ul>
+ <li><?php echo T_("GnuCash 4.x and later will no longer migrate old gconf settings from GnuCash 2.4.x.");?></li>
+ </ul>
+ </div>
- <div class="featurecontainer">
- <div class="featureborder">
- <h2 class="featuretitle"><?php echo T_("Customization and Scripting");?></h2>
- </div>
- <ul>
- <li><?php echo T_("The GnuCash widget hierarchy for CSS has been revised to be more consistent with Gtk practice. You may need to spend some time with the GtkInspector to get your custom CSS back the way you like it.");?></li>
- <li><?php echo T_("Python bindings are now localized and their strings available for translation.");?></li>
- </ul>
+ <div class="featurecontainer">
+ <div class="featureborder">
+ <h2 class="featuretitle"><?php echo T_("Customization and Scripting");?></h2>
</div>
- <p><?php printf (T_("For a complete list of new features and API changes see the %s."),
- sprintf ("<a href=\"%s/news.phtml#n-200628-4.0.news\">%s</a>", $home, T_("Release Notes"))
- );?></p>
+ <ul>
+ <li><?php echo T_("The GnuCash widget hierarchy for CSS has been revised to be more consistent with Gtk practice. You may need to spend some time with the GtkInspector to get your custom CSS back the way you like it.");?></li>
+ <li><?php echo T_("Python bindings are now localized and their strings available for translation.");?></li>
+ </ul>
+ </div>
+ <p><?php printf (T_("For a complete list of new features and API changes see the %s."),
+ sprintf ("<a href=\"%s/news.phtml#n-200628-4.0.news\">%s</a>", $home, T_("Release Notes"))
+ );?></p>
</div>
<?php include("externals/footer.phtml"); ?>
diff --git a/news.phtml b/news.phtml
index 307aa45..7e3a76c 100644
--- a/news.phtml
+++ b/news.phtml
@@ -3,6 +3,7 @@ include("emulate_globals_on.php");
include("lang.php");
$title = T_("News");
$description = T_("Announcement of New Releases, Server Maintenance,…");
+$page = $_SERVER['PHP_SELF'];
include("externals/header.phtml");
include("externals/menu.phtml");
?>
diff --git a/oldnews.phtml b/oldnews.phtml
index 4b404a5..e3aad01 100644
--- a/oldnews.phtml
+++ b/oldnews.phtml
@@ -3,17 +3,14 @@ include("emulate_globals_on.php");
include("lang.php");
$title = T_("Older Announcements");
$description = T_("This is an archive of announcements that once appeared on the GnuCash home page.");
+$page = $_SERVER['PHP_SELF'];
include("externals/header.phtml");
include("externals/menu.phtml");
?>
<div id="content">
-
-<h1><?=$title?></h1>
-
-<p>
-<?=$description?>
-</p>
+ <h1><?=$title?></h1>
+ <p><?=$description?></p>
<?php
echo("<!-- top_dir = $top_dir , home = $home -->\n");
diff --git a/sizing.phtml b/sizing.phtml
index c514727..b986c0b 100644
--- a/sizing.phtml
+++ b/sizing.phtml
@@ -1,18 +1,18 @@
<?php
+include("emulate_globals_on.php");
include("lang.php");
$title = T_("Sizing");
-$description = T_("This is a very old page about Gnucash's code size.");
-include("emulate_globals_on.php");
+$description = T_("This is an ancient page about Gnucash's code size.");
+$page = $_SERVER['PHP_SELF'];
include("externals/header.phtml");
include("externals/menu.phtml");
?>
<div id="content">
+ <h1><?=$title?></h1>
+ <p><?=$description?></p>
-<h1><?=$title?></h1>
-<p><?=$description?></p>
-
-<p class="justify">
+ <p class="justify">
<?php echo T_("It can often be quite interesting to study the source code metrics behind a software development project. Not a surprising interest: its accounting afterall. <span class=\"gnucash\">GnuCash</span> has grown, over the years, from a small handy electronic checkbook to a rather large and multi-featured desktop app.");?>
</p>
<p class="justify">
diff --git a/viewdoc.phtml b/viewdoc.phtml
index 182c957..30637c3 100644
--- a/viewdoc.phtml
+++ b/viewdoc.phtml
@@ -1,4 +1,4 @@
-<?php
+<?php
# Determine which documentation to show based on 3 parameters:
# - language (lang)
# - help or guide (doc)
@@ -6,7 +6,9 @@
include("emulate_globals_on.php");
include("lang.php");
+// Fixme: It is not trivial to reorder the components to get proper metatags
$title = T_("View document");
+$page = $_SERVER['PHP_SELF'];
include("externals/header.phtml");
include("externals/menu.phtml");
Summary of changes:
develdocs.phtml | 3 +-
donate.phtml | 3 +-
download.phtml | 1 +
externals/global_params.php | 1 +
externals/header.phtml | 4 +-
features.phtml | 13 +--
index.phtml | 2 +
new_features-4.0.phtml | 239 ++++++++++++++++++++++----------------------
news.phtml | 1 +
oldnews.phtml | 9 +-
sizing.phtml | 12 +--
viewdoc.phtml | 6 +-
12 files changed, 151 insertions(+), 143 deletions(-)
More information about the gnucash-changes
mailing list