gnucash-htdocs master: Remove beginning </div> from footer
Frank H.Ellenberger
fell at code.gnucash.org
Fri Aug 14 13:54:52 EDT 2020
Updated via https://github.com/Gnucash/gnucash-htdocs/commit/a7cd9fca (commit)
from https://github.com/Gnucash/gnucash-htdocs/commit/d41e672d (commit)
commit a7cd9fca59e669aa3f86f8ef9ec091e4c512307b
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Fri Aug 14 18:29:08 2020 +0200
Remove beginning </div> from footer
to have more logical units
diff --git a/donate.phtml b/donate.phtml
index 02032de..d54bd2c 100644
--- a/donate.phtml
+++ b/donate.phtml
@@ -1,49 +1,54 @@
-<?php
-include("lang.php");
-$title = T_("Donations");
-include("emulate_globals_on.php");
-include("externals/header.phtml");
-include("externals/menu.phtml");
+<?php
+ include ("lang.php");
+ $title = T_ ( "Donations" );
+ include ("emulate_globals_on.php");
+ include ("externals/header.phtml");
+ include ("externals/menu.phtml");
?>
<div id="content">
-<h1><?php echo T_("Donations");?></h1>
+ <h1><?=T_("Donations")?></h1>
-<p class="justify"><?php echo 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"><?=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>
-<div class="featurecontainer">
-<div class="featureborder">
-<h2 class="featuretitle"><?php echo T_("Various ways to donate");?></h2>
-</div>
+ <div class="featurecontainer">
+ <div class="featureborder">
+ <h2 class="featuretitle"><?=T_("Various ways to donate")?></h2>
+ </div>
-<h3><?= T_("You can donate via the Sourceforge tip jar");?></h3>
-<a style="float:left; margin: 0 10px 10px 0; valign:center;" href="https://sourceforge.net/donate/index.php?group_id=192"><img src="<?=$home?>/images/gnucash-sf-donation.png" alt="[Sourceforge]" /></a>
-<p><a href="https://sourceforge.net/donate/index.php?group_id=192"><?=T_("Sourceforge tip jar")?></a></p>
-<p><?= T_("The tip jar is run through Paypal into an account managed by IHTFP Consulting, owned by Derek Atkins. So don't be surprised when your payment goes there.");?></p>
+ <h3><?=T_("You can donate via the Sourceforge tip jar")?></h3>
+ <a style="float: left; margin: 0 10px 10px 0; valign: center;"
+ href="https://sourceforge.net/donate/index.php?group_id=192"><img
+ src="<?=$home?>/images/gnucash-sf-donation.png" alt="[Sourceforge]" /></a>
+ <p>
+ <a href="https://sourceforge.net/donate/index.php?group_id=192"><?=T_("Sourceforge tip jar")?></a>
+ </p>
+ <p><?=T_("The tip jar is run through Paypal into an account managed by IHTFP Consulting, owned by Derek Atkins. So don't be surprised when your payment goes there.")?></p>
+ <h3 style="clear: both;"><?= T_("You can transfer a donation to our bank account")?></h3>
+ <p><?=T_("Owner:")?> Geert Janssens<br />
+ <?=T_("Purpose: Donation")?><br />
+ <?=T_("Account:")?> 973-0754570-41<br />
+ <?=T_("Bank Identifier Code (BIC):")?> ARSPBE22XXX, <?=T_("Bank:")?> Argenta Bank Grimbergen<br />
+ <?=T_("IBAN:")?> BE88 9730 7545 7041<br />
+ <?=T_("Address of bank:")?> Argenta, Lagesteenweg 96, 1850 Grimbergen, Belgium</p>
+ </div> <!-- featurecontainer -->
-<h3 style="clear:both;"><?= T_("You can transfer a donation to our bank account");?></h3>
-<p><?php echo T_("Owner:");?> Geert Janssens<br/>
-<?php echo T_("Purpose: Donation");?><br/>
-<?php echo T_("Account:");?> 973-0754570-41<br/>
-<?php echo T_("Bank Identifier Code (BIC):");?> ARSPBE22XXX, <?php echo T_("Bank:");?> Argenta Bank Grimbergen<br/>
-<?php echo T_("IBAN:");?> BE88 9730 7545 7041<br/>
-<?php echo T_("Address of bank:");?> Argenta, Lagesteenweg 96, 1850 Grimbergen, Belgium</p>
-</div>
+ <div class="featurecontainer">
+ <div class="featureborder">
+ <h2 class="featuretitle"><?=T_("Why we appreciate your support")?></h2>
+ </div>
-<div class="featurecontainer">
-<div class="featureborder">
-<h2 class="featuretitle"><?php echo T_("Why we appreciate your support");?></h2>
-</div>
+ <p><?=T_("GnuCash is a volunteer effort. While we manage to keep our operational costs low there are inevitably expenses involved in keeping the servers running.")?></p>
+ <p><?=T_("Your contribution will be used to cover these expenses.")?></p>
+ <p><?=T_("Thank you for your support!")?></p>
+ </div> <!-- featurecontainer -->
+</div> <!-- content -->
-<p><?php echo T_("GnuCash is a volunteer effort. While we manage to keep our operational costs low there are inevitably expenses involved in keeping the servers running.");?></p>
-<p><?php echo T_("Your contribution will be used to cover these expenses.");?></p>
-<p><?php echo T_("Thank you for your support!");?></p>
-</div>
<?php include("externals/footer.phtml"); ?>
diff --git a/externals/footer.phtml b/externals/footer.phtml
index 42f2825..bdecbc6 100644
--- a/externals/footer.phtml
+++ b/externals/footer.phtml
@@ -1,25 +1,28 @@
- </div><!-- end main content area -->
-
<div id="tail">
<div id="validator">
<p about="" resource="https://www.w3.org/TR/rdfa-syntax"
rel="dc:conformsTo" xmlns:dc="https://purl.org/dc/terms/">
<a href="https://validator.w3.org/check?uri=referer">
<img src="https://www.w3.org/Icons/valid-xhtml-rdfa"
- alt="Valid XHTML + RDFa" height="31" width="88" /></a>
+ alt="Valid XHTML + RDFa" height="31" width="88" />
+ </a>
+ </p>
+ <p>
+ <a href="https://jigsaw.w3.org/css-validator/check/referer">
+ <img style="border:0;width:88px;height:31px"
+ src="https://jigsaw.w3.org/css-validator/images/vcss"
+ alt="CSS ist valide!" />
+ </a>
</p>
- <p>
- <a href="https://jigsaw.w3.org/css-validator/check/referer">
- <img style="border:0;width:88px;height:31px"
- src="https://jigsaw.w3.org/css-validator/images/vcss"
- alt="CSS ist valide!" />
- </a>
- </p>
</div>
- <p><b>Copyright © 2001–<?= Date("Y"); ?> The GnuCash Project</b>
+ <p><b>Copyright © 2001–<?=Date("Y")?> The GnuCash Project</b>
+ </p>
+ <p><?=T_("Server & email outage reports to:")?> <a href=
+ "mailto:gnucash-devel at gnucash.org"><b>gnucash-devel at gnucash.org</b></a>
+ </p>
+ <p><?=T_("Translation problems? Contact:")?> <a href=
+ "mailto:gnucash-devel at gnucash.org"><b>gnucash-devel at gnucash.org</b></a>
</p>
- <p><?= T_("Server & email outage reports to:")?> <a href="mailto:gnucash-devel at gnucash.org"><b>gnucash-devel at gnucash.org</b></a></p>
- <p><?= T_("Translation problems? Contact:");?> <a href="mailto:gnucash-devel at gnucash.org"><b>gnucash-devel at gnucash.org</b></a></p>
</div> <!-- tail -->
</body>
</html>
diff --git a/index.phtml b/index.phtml
index c4b352a..003b8e0 100644
--- a/index.phtml
+++ b/index.phtml
@@ -1,90 +1,108 @@
-<?php
- $homepage = true;
- include("emulate_globals_on.php");
- include("lang.php");
- $title = T_("Free Accounting Software");
- include("externals/header.phtml");
- include("externals/menu.phtml");
+<?php
+$homepage = true;
+include ("emulate_globals_on.php");
+include ("lang.php");
+$title = T_ ( "Free Accounting Software" );
+include ("externals/header.phtml");
+include ("externals/menu.phtml");
?>
<div id="content">
- <h1><?php echo T_("Welcome to GnuCash.org")?></h1>
+ <h1><?=T_("Welcome to GnuCash.org")?></h1>
- <div style="width:100%;float:left">
+ <div style="width: 100%; float: left">
<div class="download">
- <div style="float:left;">
+ <div style="float: left;">
<h2 id="dwnld-box"><?php printf (T_("Download GnuCash %s"), $latest_stable)?></h2>
<ul>
- <li><img alt="linux" src="<?=$top_dir?>/images/icons/linux.png" /> Linux <a href="<?php echo $latest_stable_path.$latest_stable_source;?>"><?php echo T_("Source");?></a> | <a href="<?=$home?>/download.phtml#distribution"><?php echo T_("Via distribution");?></a></li>
- <li><img alt="windows" src="<?=$top_dir?>/images/icons/windows.png" /> Microsoft Windows <a href="<?php echo $latest_stable_path.$latest_stable_win;?>">8/10</a></li>
- <li><img alt="macosx" src="<?=$top_dir?>/images/icons/macosx.png" /> Apple macOS <a href="<?php echo $latest_stable_path.$latest_stable_mac_intel;?>">>= 10.13 "High Sierra"</a></li>
- <li><a href="<?=$home?>/download.phtml" style="font-size: 80%;"><?=T_("More downloads (Source, Development,...)")?></a></li>
+ <li><img alt="linux" src="<?=$top_dir?>/images/icons/linux.png" />
+ Linux <a href="<?=$latest_stable_path.$latest_stable_source?>"><?=T_("Source")?></a>
+ | <a href="<?=$home?>/download.phtml#distribution"><?=T_("Via distribution")?></a></li>
+ <li><img alt="windows" src="<?=$top_dir?>/images/icons/windows.png" />
+ Microsoft Windows <a
+ href="<?=$latest_stable_path.$latest_stable_win?>">8/10</a></li>
+ <li><img alt="macosx" src="<?=$top_dir?>/images/icons/macosx.png" />
+ Apple macOS <a
+ href="<?=$latest_stable_path.$latest_stable_mac_intel?>">>= 10.13
+ "High Sierra"</a></li>
+ <li><a href="<?=$home?>/download.phtml" style="font-size: 80%;"><?=T_("More downloads (Source, Development,...)")?></a></li>
</ul>
</div>
<div class="downloadimage">
- <img alt="download" src="<?=$top_dir;?>/images/gnc-download.png" />
+ <img alt="download" src="<?=$top_dir?>/images/gnc-download.png" />
</div>
- <div style="float:left;">
- <p><?php printf (T_("Version %s is the last version for %s and %s and earlier."),
- "<a href=\"download.phtml#previous\">".$last_win7_version."</a>", "Windows 7", "MacOS 10.12");?></p>
- <p><?php printf (T_("Version %s is the last version for Windows XP/Vista and MacOS X 10.8 and earlier, and so the last version that will run on PowerPC Macs."),
- "<a href=\"download.phtml#historical\">".$last_xp_vista_version."</a>");?></p>
+ <div style="float: left;">
+ <p><?php printf(T_( "Version %s is the last version for %s and %s and earlier." ),
+ "<a href=\"download.phtml#previous\">".$last_win7_version."</a>", "Windows 7", "MacOS 10.12" )?>
+ </p>
+ <p><?php printf(T_("Version %s is the last version for Windows XP/Vista and MacOS X 10.8 and earlier, and so the last version that will run on PowerPC Macs."),
+ "<a href=\"download.phtml#historical\">".$last_xp_vista_version."</a>" )?>
+ </p>
</div>
</div>
- <p class="justify"><?php echo 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"><?=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"><?php echo 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>
+ <!-- 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>
</div>
- <!--Start of Need help section -->
- <div style="float:right">
+ <div style="float: right"> <!--Need help section -->
<div class="dialog note">
- <h1><?php echo T_("Need Help?");?></h1>
- <p class="justify"><?php echo T_("Looking for someone to contact about <span class=\"gnucash\">GnuCash</span>? Try the");?> <a href="https://wiki.gnucash.org/wiki/Mailing_Lists"><?php echo T_("Mailing Lists");?></a><?php echo T_(", which are public, email-based discussion groups where you can ask and answer <span class=\"gnucash\">GnuCash</span> questions to other users.");?></p>
+ <h1><?=T_("Need Help?")?></h1>
+ <p class="justify">
+ <!-- FIXME: I18N printf, markup -->
+ <?=T_("Looking for someone to contact about <span class=\"gnucash\">GnuCash</span>? Try the")?>
+ <a href="https://wiki.gnucash.org/wiki/Mailing_Lists"><?=T_("Mailing Lists")?></a>
+ <?=T_(", which are public, email-based discussion groups where you can ask and answer <span class=\"gnucash\">GnuCash</span> questions to other users.")?>
+ </p>
</div>
- </div> <!-- end of Need Help section -->
-
- <div style="width:100%">
- <h2 style="margin-bottom:1px; margin-top:0px"><?php echo T_("Feature Highlights"); ?></h2>
+ </div> <!-- Need Help section -->
+
+ <div style="width: 100%">
+ <h2 style="margin-bottom: 1px; margin-top: 0px"><?=T_("Feature Highlights"); ?></h2>
</div>
<div id="mainfeature">
<ul>
- <li><?php echo T_("Double-Entry Accounting");?></li>
- <li><?php echo T_("Stock/Bond/Mutual Fund Accounts");?></li>
- <li><?php echo T_("Small-Business Accounting");?></li>
- <li><?php echo T_("Reports, Graphs");?></li>
- <li><?php echo T_("QIF/OFX/HBCI Import, Transaction Matching");?></li>
- <li><?php echo T_("Scheduled Transactions");?></li>
- <li><?php echo T_("Financial Calculations"); ?></li>
+ <li><?=T_("Double-Entry Accounting")?></li>
+ <li><?=T_("Stock/Bond/Mutual Fund Accounts")?></li>
+ <li><?=T_("Small-Business Accounting")?></li>
+ <li><?=T_("Reports, Graphs")?></li>
+ <li><?=T_("QIF/OFX/HBCI Import, Transaction Matching")?></li>
+ <li><?=T_("Scheduled Transactions")?></li>
+ <li><?=T_("Financial Calculations"); ?></li>
</ul>
- <a href="<?=$home?>/features.phtml"><?php echo T_("<b>Discover more...</b>");?></a>
- </div> <!-- mainfeature -->
+ <a href="<?=$home?>/features.phtml"><?=T_("<b>Discover more...</b>")?></a>
+ </div>
+ <!-- mainfeature -->
<div id="newfeatures">
- <h1><?php printf (T_("GnuCash %s Released"), "4.0"); ?></h1>
- <p><?php printf (T_("We've released GnuCash %s with many bugfixes and improvements including some %s!"), "4.0",
- sprintf("<a href=\"%s\">%s</a>", $home."/new_features-4.0.phtml", T_("great new features"))
- );?></p>
- </div> <!-- newfeatures -->
+ <h1><?php printf(T_("GnuCash %s Released"), "4.0"); ?></h1>
+ <p><?php printf(T_("We've released GnuCash %s with many bugfixes and improvements including some %s!"), "4.0",
+ sprintf("<a href=\"%s\">%s</a>", $home . "/new_features-4.0.phtml", T_("great new features")))?>
+ </p>
+ </div>
+ <!-- newfeatures -->
- <!-- Android app info
- <div class="download" style="margin-top:2em">
- <h3 style="margin-bottom:1px; margin-top:0px">GnuCash for Android</h3>
- <div style="width:172px; height:100%; float:right; margin-left:15px; margin-right:15px">
- <a href="https://play.google.com/store/apps/details?id=org.gnucash.android" target="_blank">
- <img alt="Get it on Google Play" src="https://developer.android.com/images/brand/en_generic_rgb_wo_60.png" />
- </a>
- <p style="text-align:center"><a href="https://github.com/codinguser/gnucash-android/blob/master/README.md" target="_blank"><?php echo T_("Info and development");?></a></p>
- </div>
- <p><?php echo T_("The GnuCash team recommends the GnuCash for Android app. This app allows you to keep track of your financial transactions on the go for later import into the desktop version of GnuCash.");?></p>
- <p><i><b><?php echo T_("Note that GnuCash for Android is not a port of the GnuCash program to Android.");?></b></i></p>
- </div> < end Android app info -->
+ <!-- Android app info
+ <div class="download" style="margin-top:2em">
+ <h3 style="margin-bottom:1px; margin-top:0px">GnuCash for Android</h3>
+ <div style="width:172px; height:100%; float:right; margin-left:15px; margin-right:15px">
+ <a href="https://play.google.com/store/apps/details?id=org.gnucash.android" target="_blank">
+ <img alt="Get it on Google Play" src="https://developer.android.com/images/brand/en_generic_rgb_wo_60.png" />
+ </a>
+ <p style="text-align:center"><a href="https://github.com/codinguser/gnucash-android/blob/master/README.md" target="_blank"><?=T_("Info and development")?></a></p>
+ </div>
+ <p><?=T_("The GnuCash team recommends the GnuCash for Android app. This app allows you to keep track of your financial transactions on the go for later import into the desktop version of GnuCash.")?></p>
+ <p><i><b><?=T_("Note that GnuCash for Android is not a port of the GnuCash program to Android.")?></b></i></p>
+ </div> < end Android app info -->
+</div>
+<!-- content -->
<?php include("externals/footer.phtml"); ?>
Summary of changes:
donate.phtml | 69 ++++++++++++++------------
externals/footer.phtml | 29 ++++++-----
index.phtml | 130 ++++++++++++++++++++++++++++---------------------
3 files changed, 127 insertions(+), 101 deletions(-)
More information about the gnucash-changes
mailing list