gnucash-htdocs master: Multiple changes pushed
Frank H.Ellenberger
fell at code.gnucash.org
Mon Oct 12 17:39:13 EDT 2020
Updated via https://github.com/Gnucash/gnucash-htdocs/commit/42dad04f (commit)
via https://github.com/Gnucash/gnucash-htdocs/commit/d12e8fd4 (commit)
via https://github.com/Gnucash/gnucash-htdocs/commit/334d1ab0 (commit)
via https://github.com/Gnucash/gnucash-htdocs/commit/ae6e4e7e (commit)
via https://github.com/Gnucash/gnucash-htdocs/commit/4f6b8c07 (commit)
via https://github.com/Gnucash/gnucash-htdocs/commit/8c38f99f (commit)
via https://github.com/Gnucash/gnucash-htdocs/commit/0444b4e9 (commit)
via https://github.com/Gnucash/gnucash-htdocs/commit/384d4452 (commit)
via https://github.com/Gnucash/gnucash-htdocs/commit/66bd62b2 (commit)
via https://github.com/Gnucash/gnucash-htdocs/commit/062affde (commit)
from https://github.com/Gnucash/gnucash-htdocs/commit/2376fae8 (commit)
commit 42dad04f4ad425eeeeec02a6dd439a515bb22107
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Mon Oct 12 23:37:21 2020 +0200
Do not expose disabled code snippets
diff --git a/externals/header.phtml b/externals/header.phtml
index 08904cc..a67be80 100644
--- a/externals/header.phtml
+++ b/externals/header.phtml
@@ -41,15 +41,15 @@
<html prefix="og: https://ogp.me/ns#" lang="<?=$locale_str?>">
<head>
- <!-- Primary Meta Tags -->
-<?php
+<?php // Primary Meta Tags
if (!isset($can_utf)) { $can_utf = true; }
if ($can_utf)
- { ?>
+ { ?>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+<?php } //if ($can_utf) ?>
- <!-- Useful for mobile devices: Zoom out and allow scaling. -->
- <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes"/>
+ <title><?=$full_title?></title>
+ <meta name="description" content="<?=strip_tags($description)?>"/>
<!--meta properties for facebook Open Graph-->
<meta property="og:locale" content="<?=$locale_str?>"/>
@@ -65,12 +65,14 @@
<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-->
+<?php // end of Open Graph properties ?>
-<?php } //if ($can_utf) ?>
<link rel="stylesheet" href="<?=$home?>/externals/gnucash.css" type="text/css" />
- <!-- FavIcons for many different devices -->
+<?php // Device specific:
+ // Useful for mobile devices: Zoom out and allow scaling. ?>
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes"/>
+<?php // FavIcons for many different devices ?>
<link rel="icon" href="<?=$home?>/favicon.ico" type="image/x-icon" />
<link rel="apple-touch-icon" sizes="180x180" href="<?=$home?>/apple-touch-icon.png?v=gAXA7A9nAq"/>
<link rel="icon" type="image/png" sizes="32x32" href="<?=$home?>/favicon-32x32.png?v=gAXA7A9nAq"/>
@@ -81,32 +83,26 @@
<meta name="msapplication-TileColor" content="#da532c"/>
<meta name="theme-color" content="#ffffff"/>
- <?php
- $current_page = array_key_exists('HTTP_HOST', $_SERVER) ? ($top_dir . "/" . basename($_SERVER["SCRIPT_NAME"])) : "";
-
- if (isset($homepage)) { ?>
- <link rel="alternate" type="application/atom+xml" title="Atom Feed" href="<?=$home?>/atom.php" />
- <?php } ?>
-
- <title><?=$full_title?></title>
- <meta name="description" content="<?=strip_tags($description)?>"/>
+<?php
+ $current_page = array_key_exists('HTTP_HOST', $_SERVER) ? ($top_dir . "/" . basename($_SERVER["SCRIPT_NAME"])) : "";
+
+ if (isset($homepage)) { ?>
+ <link rel="alternate" type="application/atom+xml" title="Atom Feed" href="<?=$home?>/atom.php" />
+<?php } ?>
</head>
<body>
-
<div id="head">
-
<div id="branding">
<p><img src="<?=$top_dir?>/images/gnucash-vert.png" alt="GnuCash" /></p>
</div>
-
+
+<?php /* FIXME: It does not conform to
+ https://curia.europa.eu/jcms/upload/docs/application/pdf/2019-07/cp190099en.pdf
+ potential fix: an improved version of
+ https://www.heise.de/ct/ausgabe/2014-26-Social-Media-Buttons-datenschutzkonform-nutzen-2463330.html
<div id="socialbuttons">
-
<!--facebook like button-->
- <!-- FIXME: It does not conform to
- https://curia.europa.eu/jcms/upload/docs/application/pdf/2019-07/cp190099en.pdf
- potential fix: an improve version of
- https://www.heise.de/ct/ausgabe/2014-26-Social-Media-Buttons-datenschutzkonform-nutzen-2463330.html
<div style="padding:0 0 5px 0">
<div id="fb-root"></div>
<script type="text/javascript">
@@ -123,9 +119,9 @@
data-send="false" data-layout="box_count" data-width="60"
data-show-faces="true" data-font="verdana">
</div>
- </div> End of FIXME --> <!-- facebook like button-->
+ </div> <!-- facebook like button-->
</div> <!-- socialbuttons -->
-
+*/ ?>
<!-- the icons on the top right-->
<div style="float:right;">
<ul id="navlist">
@@ -160,10 +156,10 @@
| <a class="nav" href="<?= make_lang_href($current_page, $get_parms, "zh_CN"); ?>">简体ä¸æ–‡</a>
| <a class="nav" href="<?= make_lang_href($current_page, $get_parms, "zh_TW"); ?>">ç¹é«”ä¸æ–‡</a>
</span> <!-- language -->
- <span id="location"> <!-- The mirrors currently not exist
+ <span id="location"> <?php /* The mirrors currently not exist
<?= _("Continent"); ?>:
(<a class="nav" href="https://www.gnucash.org/">US</a>)
(<a class="nav" href="http://www.at.gnucash.org/">EU</a>)
- (<a class="nav" href="http://www.au.gnucash.org/">AU</a>) -->
+ (<a class="nav" href="http://www.au.gnucash.org/">AU</a>) */ ?>
</span> <!-- Continent -->
</div> <!-- head -->
diff --git a/externals/menu.phtml b/externals/menu.phtml
index 91c4667..63d94aa 100644
--- a/externals/menu.phtml
+++ b/externals/menu.phtml
@@ -8,10 +8,10 @@
<ul>
<li><a href="<?=$home?>/index.phtml"><?= T_("Home")?></a></li>
<li><a href="<?=$home?>/news.phtml"><?= T_("News")?></a></li>
- <!--RSS atom feed link is on the top-right of the page
+<?PHP /* RSS atom feed link is now on the top-right of the header
<li><a href="<?=$home?>/atom.php">
<img src="<?=$home?>/images/icons/feed-icon-12x12.png" width="12" height="12" alt="[atom feed]" /> <?= T_("News Feed")?></a></li>
- -->
+ */ ?>
<li><a href="<?=$home?>/features.phtml"><?=T_("Screenshots, Features")?></a></li>
<li><a href="https://wiki.gnucash.org/wiki/Installation"><?=T_("Installation")?></a></li>
<li><a href="https://wiki.gnucash.org/wiki/Getting_Help"><?= T_("Getting help")?></a></li>
@@ -19,7 +19,6 @@
</ul>
</div>
<div class="othernews">
- <!-- ?php include("$top_dir/externals/menu-downloads.phtml");? -->
<span class="linktop">
<b><?=T_("Downloads")?></b>
</span>
@@ -36,11 +35,13 @@
<li><a href="https://wiki.gnucash.org/wiki/FAQ"><?=T_("FAQ")?></a></li>
<li><a href="https://wiki.gnucash.org/wiki/"><?=T_("Wiki")?></a> <a href="https://wiki.gnucash.org/wiki/De/GnuCash">[de]</a></li>
<li><a href="https://wiki.gnucash.org/wiki/Mailing_Lists"><?=T_("Mailing Lists")?></a></li>
- <!-- <li style="list-style-image:none;list-style-type:none;">
+<?PHP /* http://www.namazu.org/ made the last release 2011-07-18
+ <li style="list-style-image:none;list-style-type:none;">
<ul style="padding-bottom:0px; margin-top:0px; margin-bottom:5px;">
- <li><a href="https://lists.gnucash.org/search/<? if ($locale != "") { echo "?lang=$locale"; } ?>"><?=T_("Search")?></a></li>
+ <li><a href="https://lists.gnucash.org/search/<? if ($locale != "") { echo "?lang=$locale"; } ?>"><?=T_("Search")?></a></li>
</ul>
- </li>-->
+ </li>
+ */ ?>
<li><a href="https://wiki.gnucash.org/wiki/Bugzilla"><?=T_("Bug Reports")?></a></li>
<li><a href="https://wiki.gnucash.org/wiki/IRC"><?=T_("IRC (Chat)")?></a></li>
</ul>
commit d12e8fd41da15dc25328942cbcac4cefc39aedd3
Merge: 334d1ab 2376fae
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Sun Oct 11 03:28:45 2020 +0200
Merge branch 'master' into beta
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 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");
commit 4f6b8c07459d970f4b893e7f31431e27c253e72d
Merge: 8c38f99 e7b3b8f
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Wed Oct 7 19:31:17 2020 +0200
Merge branch 'master' into beta
commit 8c38f99ffbb604fa087ef9b5f30679ae30d25361
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Wed Oct 7 19:23:00 2020 +0200
Add description to almost all pages
But I have no idea for viewdoc.
A few other minor improvements.
I18N: 2 new messages, IIRC
diff --git a/2.6-release-tour.phtml b/2.6-release-tour.phtml
index eefe068..5ddde69 100644
--- a/2.6-release-tour.phtml
+++ b/2.6-release-tour.phtml
@@ -1,21 +1,19 @@
<?php
include("lang.php");
$title = T_("GnuCash 2.6 release tour");
+$description = T_("This tour will introduce you to new major features in <span class=\"gnucash\">GnuCash</span> 2.6.");
include("emulate_globals_on.php");
include("$top_dir/externals/header.phtml");
include("$top_dir/externals/menu.phtml");
?>
<div id="content">
-<h1><?php echo T_($title);?></h1>
+<h1><?=$title?></h1>
<div>
-<p>
-<?php echo T_("This tour will introduce you to new major features in <span class=\"gnucash\">GnuCash</span> 2.6.");?>
-</p>
+ <p><?=$description?></p>
</div>
-
<h2 class="featuretitle"><?php echo T_("Jqplot Reports");?></h2>
<p class="justify">
<?php echo T_("<span class=\"gnucash\">GnuCash</span> now uses javascript jqplot to render reports. This gives a more professional look to all graphical reports (piechart, barchart, scatterplot).");?>
diff --git a/develdocs.phtml b/develdocs.phtml
index a75af4b..6bc4738 100644
--- a/develdocs.phtml
+++ b/develdocs.phtml
@@ -1,6 +1,7 @@
<?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");
include("externals/header.phtml");
include("externals/menu.phtml");
@@ -10,7 +11,7 @@ include("externals/menu.phtml");
<h1><?php echo T_("Writing GnuCash Documentation");?></h1>
-<p class="justify"><?php echo 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.");?></p>
+<p class="justify"><?=$description?></p>
<p class="justify"><?php echo T_("Just as the <span class=\"gnucash\">GnuCash</span> application has been developed over time by volunteers, so too has the documentation been written by volunteer developers and users to help others learn how <span class=\"gnucash\">GnuCash</span> works. This collaborative effort has resulted in the creation of two major documents, the <b>Help Manual</b> and the <b>Tutorial and Concepts Guide</b>.");?></p>
diff --git a/docs.phtml b/docs.phtml
index 1b1a961..2843e63 100644
--- a/docs.phtml
+++ b/docs.phtml
@@ -8,6 +8,7 @@
*/
include("lang.php");
$title = T_("Documentation");
+ $description = T_("The following links are to the <strong>English HTML editions of the current stable branch</strong> documentation. See further down the page for other <span class=\"gnucash\">GnuCash</span> versions, languages, and formats.");
$online = T_("Browse documentation online");
$pdf = T_("Download documentation as PDF");
$epub = T_("Download documentation as epub");
@@ -19,11 +20,11 @@
<div id="content">
- <h1><?php echo T_("GnuCash Documentation");?></h1>
+ <h1><?=$title?></h1>
<p class="justify"><?php
- echo T_("The following links are to the <strong>English HTML editions of the current stable branch</strong> documentation. See further down the page for other <span class=\"gnucash\">GnuCash</span> versions, languages, and formats.");
+ echo $description;
echo T_("There are two major <span class=\"gnucash\">GnuCash</span> documentation packages to help users:");?></p>
<ul>
<li><a href="<?=$top_dir;?>/viewdoc.phtml?rev=<?=$major_stable;?>&lang=C&doc=help"><b><?php echo T_("The Help Manual");?></b></a></li>
diff --git a/donate.phtml b/donate.phtml
index d54bd2c..3d30b72 100644
--- a/donate.phtml
+++ b/donate.phtml
@@ -1,6 +1,7 @@
<?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");
include ("externals/header.phtml");
include ("externals/menu.phtml");
@@ -8,9 +9,9 @@
<div id="content">
- <h1><?=T_("Donations")?></h1>
+ <h1><?=$title?></h1>
- <p class="justify"><?=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.")?></p>
+ <p class="justify"><?=$description?></p>
<div class="featurecontainer">
diff --git a/download.phtml b/download.phtml
index c834e6a..d2f7348 100644
--- a/download.phtml
+++ b/download.phtml
@@ -3,6 +3,7 @@
include("emulate_globals_on.php");
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.");
include("externals/header.phtml");
include("externals/menu.phtml");
?>
@@ -10,6 +11,7 @@
<div id="content">
<h1><?php echo T_("Download GnuCash")?></h1>
+ <p class="justify"><?=$description?></p>
<div class="featureborder">
<h2 class="featuretitle"><?php printf (T_("Stable release (%s)"), $latest_stable)?></h2>
diff --git a/features.phtml b/features.phtml
index 3fa0965..8f0a656 100644
--- a/features.phtml
+++ b/features.phtml
@@ -1,18 +1,17 @@
<?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");
?>
<div id="content">
-<h1><?php echo T_($title);?></h1>
+<h1><?=$title?></h1>
<div>
-<p>
-<?php echo 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.");?>
-</p>
+<p><?=$description?></p>
<ul>
<li><a href="#main-feat"><?php echo T_("Main features");?></a></li>
<li><a href="#advan-feat"><?php echo T_("Advanced features");?></a></li>
diff --git a/new_features-4.0.phtml b/new_features-4.0.phtml
index 7f838b1..415fb5e 100644
--- a/new_features-4.0.phtml
+++ b/new_features-4.0.phtml
@@ -1,13 +1,14 @@
<?php
include("lang.php");
-$title = T_("Features");
+$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");
?>
<div id="content">
- <h1><?php printf (T_("What's New in GnuCash %s"),"4.0");?></h1>
+ <h1><?$description?></h1>
<div class="featurecontainer">
<div class="featureborder">
@@ -17,13 +18,13 @@ include("$top_dir/externals/menu.phtml");
<img class="featureimage"
src="<?=$top_dir?>/images/4.0-release/trans-assoc.png"
alt="[Transaction Association Dialog]"/>
- <p class="justify">
+ <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>
- </p>
+ </div>
</div>
<div class="row">
<video class="featureimage" controls>
diff --git a/news.phtml b/news.phtml
index b00b853..307aa45 100644
--- a/news.phtml
+++ b/news.phtml
@@ -2,6 +2,7 @@
include("emulate_globals_on.php");
include("lang.php");
$title = T_("News");
+$description = T_("Announcement of New Releases, Server Maintenance,…");
include("externals/header.phtml");
include("externals/menu.phtml");
?>
@@ -9,7 +10,9 @@ include("externals/menu.phtml");
<div id="content">
<div id="newscontainer">
<h1><?php echo T_("GnuCash News"); ?></h1>
+ <p><?=$description?></p>
<?php
+ if (!isset($top_dir)) { $top_dir = $GLOBALS["top_dir"]; }
echo("<!-- top_dir = $top_dir , home = $home -->\n");
# News will continue to be translated separately because
# of the .txt format.
diff --git a/oldnews.phtml b/oldnews.phtml
index 53cb59f..4b404a5 100644
--- a/oldnews.phtml
+++ b/oldnews.phtml
@@ -1,17 +1,18 @@
<?php
include("emulate_globals_on.php");
include("lang.php");
-$title = T_("Free Accounting Software");
+$title = T_("Older Announcements");
+$description = T_("This is an archive of announcements that once appeared on the GnuCash home page.");
include("externals/header.phtml");
include("externals/menu.phtml");
?>
<div id="content">
-<h1><?php echo T_("Older Announcements");?></h1>
+<h1><?=$title?></h1>
<p>
-<?php echo T_("This is an archive of announcements that once appeared on the GnuCash home page.");?>
+<?=$description?>
</p>
<?php
diff --git a/sizing.phtml b/sizing.phtml
index 411eb95..c514727 100644
--- a/sizing.phtml
+++ b/sizing.phtml
@@ -1,6 +1,7 @@
<?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");
include("externals/header.phtml");
include("externals/menu.phtml");
@@ -8,7 +9,8 @@ include("externals/menu.phtml");
<div id="content">
-<h1><?php echo T_($title);?></h1>
+<h1><?=$title?></h1>
+<p><?=$description?></p>
<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.");?>
commit 0444b4e9ac9952088034a16e00fae7b1a66e9820
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Tue Oct 6 06:29:11 2020 +0200
Add meta tag description
diff --git a/externals/header.phtml b/externals/header.phtml
index ce1232b..3b61f81 100644
--- a/externals/header.phtml
+++ b/externals/header.phtml
@@ -89,6 +89,7 @@
<?php } ?>
<title><?=$full_title?></title>
+ <meta name="description" content="<?=strip_tags($description)?>"/>
</head>
<body>
commit 384d4452915f96ada57d011d30b100aceacb367b
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Tue Oct 6 02:53:48 2020 +0200
Disable bitrotten languages in lang.php:$supported_languages
diff --git a/lang.php b/lang.php
index 0738470..c07e832 100644
--- a/lang.php
+++ b/lang.php
@@ -31,10 +31,20 @@ if (array_key_exists('lang', $_GET)) { $locale = $_GET["lang"]; }
# key: locale, value: lang_dir
$supported_languages = array(
'ca_ES' => 'ca',
- 'de_DE' => 'de', 'es_ES' => 'es', 'fr_FR' => 'fr', 'hr_HR' => 'hr',
- 'hu_HU' => 'hu', 'it_IT' => 'it', 'ja_JP' => 'ja', 'nb_NO' => 'nb',
- 'nl_NL' => 'nl', 'pl_PL' => 'pl', 'pt_PT' => 'pt',
- 'zh_CN' => 'zh_CN', 'zh_TW' => 'zh_TW', 'en_US' => 'en',
+ 'de_DE' => 'de',
+// 'es_ES' => 'es',
+ 'fr_FR' => 'fr',
+ 'hr_HR' => 'hr',
+ 'hu_HU' => 'hu',
+ 'it_IT' => 'it',
+ 'ja_JP' => 'ja',
+// 'nb_NO' => 'nb',
+ 'nl_NL' => 'nl',
+// 'pl_PL' => 'pl',
+ 'pt_PT' => 'pt',
+ 'zh_CN' => 'zh_CN',
+ 'zh_TW' => 'zh_TW',
+ 'en_US' => 'en',
'C' => 'en'
);
commit 66bd62b20050aa093f629fd444027da6b244da69
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Tue Sep 29 03:03:12 2020 +0200
Improvement of metadata
Fix quoting from previous commit,
add og:locale*,
allow title & description per page,
and finally some cleanup.
diff --git a/externals/global_params.php b/externals/global_params.php
index 7fa0553..50e1e52 100644
--- a/externals/global_params.php
+++ b/externals/global_params.php
@@ -73,4 +73,7 @@
$URL_FLATPAK="https://flatpak.org/";
$URL_WIKI="https://wiki.gnucash.org/wiki/";
+ // some defaults for metatags in case the page does not set them
+ $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 3d5c252..ce1232b 100644
--- a/externals/header.phtml
+++ b/externals/header.phtml
@@ -5,7 +5,12 @@
$titledonation = T_("Support the GnuCash project with a donation");
$titleuservoice = T_("Request or vote enhancements for GnuCash");
$titlefb = T_("GnuCash on facebook");
-
+
+ include("$top_dir/externals/global_params.php");
+ if (!isset($title)) { $title = $GLOBALS["default_title"]; };
+ $full_title = $title." | GnuCash";
+ if (!isset($description)) { $description = $default_description; };
+
# This function will create a link to the given page
# reusing the get parameters that were specified
# with the option to override the language
@@ -34,9 +39,10 @@
}
?>
-<html lang="<?php echo $locale_str; ?>">
+<html prefix="og: https://ogp.me/ns#" lang="<?=$locale_str?>">
<head>
- <?php
+ <!-- Primary Meta Tags -->
+<?php
if (!isset($can_utf)) { $can_utf = true; }
if ($can_utf)
{ ?>
@@ -46,17 +52,25 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes"/>
<!--meta properties for facebook Open Graph-->
- <meta property="og:title" content="<?=T_("Free Accounting Software")?> | GnuCash"/>
+ <meta property="og:locale" content="<?=$locale_str?>"/>
+<?php // add og:locale:alternate(s)
+ foreach ($GLOBALS ["supported_languages"] as $key => $value) {
+ if ($value != $locale_str)
+ { echo " <meta property=\"og:locale:alternate\" content=\"{$value}\"/>\n"; }
+ }
+ ?>
+ <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:site_name" content="GnuCash"/>
- <meta property="og:description" content="<?=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.")?>"/>
+ <meta property="og:description" content="<?=strip_tags($description)?>"/>
<!--end of Open Graph properties-->
- <?php } ?>
+<?php } //if ($can_utf) ?>
<link rel="stylesheet" href="<?=$home?>/externals/gnucash.css" type="text/css" />
+ <!-- FavIcons for many different devices -->
<link rel="icon" href="<?=$home?>/favicon.ico" type="image/x-icon" />
<link rel="apple-touch-icon" sizes="180x180" href="<?=$home?>/apple-touch-icon.png?v=gAXA7A9nAq"/>
<link rel="icon" type="image/png" sizes="32x32" href="<?=$home?>/favicon-32x32.png?v=gAXA7A9nAq"/>
@@ -68,14 +82,13 @@
<meta name="theme-color" content="#ffffff"/>
<?php
- include("$top_dir/externals/global_params.php");
$current_page = array_key_exists('HTTP_HOST', $_SERVER) ? ($top_dir . "/" . basename($_SERVER["SCRIPT_NAME"])) : "";
if (isset($homepage)) { ?>
<link rel="alternate" type="application/atom+xml" title="Atom Feed" href="<?=$home?>/atom.php" />
<?php } ?>
- <title><?= T_($title); ?> | GnuCash</title>
+ <title><?=$full_title?></title>
</head>
<body>
@@ -141,7 +154,7 @@
| <a class="nav" href="<?= make_lang_href($current_page, $get_parms, "hu_HU"); ?>">Magyar</a>
| <a class="nav" href="<?= make_lang_href($current_page, $get_parms, "nl_NL"); ?>">Nederlands</a>
<!--| <a class="nav" href="<?= make_lang_href($current_page, $get_parms, "nb_NO"); ?>">Norsk Bokmål</a>-->
- <!-- | <a class="nav" href="<?= make_lang_href($current_page, $get_parms, "pl_PL"); ?>">Polska</a> -->
+ <!--| <a class="nav" href="<?= make_lang_href($current_page, $get_parms, "pl_PL"); ?>">Polska</a> -->
| <a class="nav" href="<?= make_lang_href($current_page, $get_parms, "pt_PT"); ?>">Português</a>
| <a class="nav" href="<?= make_lang_href($current_page, $get_parms, "zh_CN"); ?>">简体ä¸æ–‡</a>
| <a class="nav" href="<?= make_lang_href($current_page, $get_parms, "zh_TW"); ?>">ç¹é«”ä¸æ–‡</a>
diff --git a/index.phtml b/index.phtml
index 71a347b..bb85157 100644
--- a/index.phtml
+++ b/index.phtml
@@ -2,7 +2,6 @@
$homepage = true;
include ("emulate_globals_on.php");
include ("lang.php");
-$title = T_ ( "Free Accounting Software" );
include ("externals/header.phtml");
include ("externals/menu.phtml");
?>
@@ -46,7 +45,7 @@ include ("externals/menu.phtml");
</div>
</div>
- <p class="justify"><?=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.")?></p>
+ <p class="justify"><?=$GLOBALS ["default_description"]?></p>
<!-- FIXME: I18N spaces, markup-->
<p class="justify"><?=T_("Designed to be easy to use, yet powerful and flexible, <span class=\"gnucash\">GnuCash</span> allows you to track bank accounts, stocks, income and expenses. As quick and intuitive to use as a checkbook register, it is based on professional accounting principles to ensure balanced books and accurate reports. "); ?></p>
commit 062affde0e2297df973332a01bacd3541b69161a
Author: milotype <43657314+milotype at users.noreply.github.com>
Date: Sun Mar 24 02:49:20 2019 +0100
Update header.phtml
To improve the multilinguality of the website in web-search results, I propose some changes in the meta tags of the <head> of the „header.phtml†file. The idea is to use translated text for the other languages.
Changes would be made for:
a) meta property="og:title"
b) meta property="og:description"
c) meta name="description"
It has something to do with php stuff. As I’m not a programmer, I’m not sure if this solution works, nor if it is legit. But something similar is being used in the „menu.phtml†file.
!!! Please see the diff between my new file and the orig file on master !!!
P.S.
I’ve checked my „experiment†at https://metatags.io/
It seems that html-tags within then strings don’t matter (which I was afraid of).
If my changes don’t work, maybe somebody knows how to handle the issue. But that would probably be something for a feature request ...
diff --git a/externals/header.phtml b/externals/header.phtml
index 75369ea..3d5c252 100644
--- a/externals/header.phtml
+++ b/externals/header.phtml
@@ -46,12 +46,12 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes"/>
<!--meta properties for facebook Open Graph-->
- <meta property="og:title" content="Free Accounting Software | GnuCash"/>
+ <meta property="og:title" content="<?=T_("Free Accounting Software")?> | GnuCash"/>
<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:site_name" content="GnuCash"/>
- <meta property="og:description" content="A personal and small-business financial-accounting software, licensed under GNU/GPL and available for Linux, Windows, Mac OS X, BSD, and Solaris."/>
+ <meta property="og:description" content="<?=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.")?>"/>
<!--end of Open Graph properties-->
<?php } ?>
Summary of changes:
2.6-release-tour.phtml | 8 +-
develdocs.phtml | 6 +-
docs.phtml | 5 +-
donate.phtml | 8 +-
download.phtml | 3 +
externals/global_params.php | 4 +
externals/header.phtml | 78 ++++++++-------
externals/menu.phtml | 13 +--
features.phtml | 18 ++--
index.phtml | 5 +-
lang.php | 18 +++-
new_features-4.0.phtml | 238 ++++++++++++++++++++++----------------------
news.phtml | 4 +
oldnews.phtml | 12 +--
sizing.phtml | 10 +-
viewdoc.phtml | 4 +-
16 files changed, 237 insertions(+), 197 deletions(-)
More information about the gnucash-changes
mailing list