[Gnucash-changes] r14014 - htdocs/trunk/externals - menu inversion:
php-escaped html, not html-emitting php.
Joshua Sled
jsled at cvs.gnucash.org
Wed May 10 22:39:15 EDT 2006
Author: jsled
Date: 2006-05-10 22:39:13 -0400 (Wed, 10 May 2006)
New Revision: 14014
Trac: http://svn.gnucash.org/trac/changeset/14014
Modified:
htdocs/trunk/externals/footer.phtml
htdocs/trunk/externals/header.phtml
htdocs/trunk/externals/menu-developer.phtml
htdocs/trunk/externals/menu-documentation.phtml
htdocs/trunk/externals/menu-general.phtml
htdocs/trunk/externals/menu-main-developer.phtml
htdocs/trunk/externals/menu-main-documentation.phtml
htdocs/trunk/externals/menu-main-general.phtml
htdocs/trunk/externals/menu-main-help.phtml
htdocs/trunk/externals/menu-main-other.phtml
htdocs/trunk/externals/menu-main.phtml
htdocs/trunk/externals/menu-other.phtml
Log:
menu inversion: php-escaped html, not html-emitting php.
Modified: htdocs/trunk/externals/footer.phtml
===================================================================
--- htdocs/trunk/externals/footer.phtml 2006-05-11 02:01:09 UTC (rev 14013)
+++ htdocs/trunk/externals/footer.phtml 2006-05-11 02:39:13 UTC (rev 14014)
@@ -1,7 +1,7 @@
<div id="tail">
<p id="validation"><a href="http://validator.w3.org/check/referer">
-<img src="$top_dir/images/valid-html40.png" alt="valid HTML" width="88" height="31" /></a> </p>
-<p id="rss"><a href="<?php echo "$home";?>/rss-feed.phtml"><img src="$top_dir/images/rss.gif" alt="rss logo" width="36" height="14" /></a></p>
+<img src="<?=$top_dir?>/images/valid-html40.png" alt="valid HTML" width="88" height="31" /></a> </p>
+<p id="rss"><a href="<?=$home?>/rss-feed.phtml"><img src="<?=$top_dir?>/images/rss.gif" alt="rss logo" width="36" height="14" /></a></p>
<p style="text-align:center;"><b>Copyright © 2001-2006 The GnuCash Project</b></p>
<p style="text-align:center;">Server & email outage reports to
<a href="mailto:gnucash-devel at gnucash.org"><b>gnucash-devel at gnucash.org</b></a></p>
Modified: htdocs/trunk/externals/header.phtml
===================================================================
--- htdocs/trunk/externals/header.phtml 2006-05-11 02:01:09 UTC (rev 14013)
+++ htdocs/trunk/externals/header.phtml 2006-05-11 02:39:13 UTC (rev 14014)
@@ -7,28 +7,28 @@
<link rel="shortcut icon" href="<?=$top_dir?>/favicon.ico" type="image/x-icon" />
<?php echo $mimeline; ?>
<?php
+$home = ".";
-$home = $top_dir;
-
if (isset($homepage)) { ?>
<!-- the RSS only appears on the home page, not on all pages. -->
-<link rel="alternate" type="application/rss+xml" title="RSS" href="http://www.gnucash.org/en/rss-feed.phtml">
+<link rel="alternate" type="application/rss+xml" title="RSS" href="<?=$top_dir?>rss-feed.phtml">
<?php } ?>
-<title>GnuCash - <?php echo _($title); ?></title>
+<title>GnuCash - <?= _($title); ?></title>
</head>
<body>
+
<div id="head">
<img src="<?=$top_dir?>/images/gnucash_logo1.png" alt="[GnuCash Logo]" id="gnclogo" width="179" height="45" />
<br/>
<span id="language">
Language:
-<a class="nav" href="<?=$home;?>">English</a>
-| <a class="nav" href="<?=$home;?>/fr/">Français</a>
-| <a class="nav" href="<?=$home?>/de/">Deutsch</a>
-| <a class="nav" href="<?=$home;?>/nl/">Nederlands</a>
-| <a class="nav" href="<?=$home;?>/pt_PT/">Português</a>
+ <a class="nav" href="<?=$top_dir;?>">English</a>
+| <a class="nav" href="<?=$top_dir;?>/fr/">Français</a>
+| <a class="nav" href="<?=$top_dir;?>/de/">Deutsch</a>
+| <a class="nav" href="<?=$top_dir;?>/nl/">Nederlands</a>
+| <a class="nav" href="<?=$top_dir;?>/pt_PT/">Português</a>
</span>
<span id="location">Continent:
(<a class="nav" href="http://www.gnucash.org/">US</a>)
Modified: htdocs/trunk/externals/menu-developer.phtml
===================================================================
--- htdocs/trunk/externals/menu-developer.phtml 2006-05-11 02:01:09 UTC (rev 14013)
+++ htdocs/trunk/externals/menu-developer.phtml 2006-05-11 02:39:13 UTC (rev 14014)
@@ -1,15 +1,10 @@
-<?php
-echo "<span class=\"linktop\">\n";
-echo "<img class=\"dot\" src=\"$top_dir/images/webding.png\" alt=\"marker\">\n";
-echo "<b>" . _("Developer Information") . "</b>\n";
-echo "</span>\n";
-echo "<ul>";
-echo "<li><a href=\"http://svn.gnucash.org/docs/HEAD/\">" . _("Source Docs") . "</a></li>\n";
-echo "<li><a href=\"http://svn.gnucash.org/trac/browser/\">";
-echo _("Browse Source Code") . "</a></li>\n";
-echo "<li><a href=\"http://wiki.gnucash.org/wiki/Subversion\">";
-echo _("Subversion Access") . "</a></li>\n";
-echo "<li><a href=\"http://wiki.gnucash.org/wiki/Translation\">";
-echo _("Language Translations") . "</a></li>\n";
-echo "</ul>\n";
-?>
+<span class="linktop">
+<img class="dot" src="<?=$top_dir?>/images/webding.png" alt="marker">
+<b><?=_("Developer Information")?></b>
+</span>
+<ul>
+<li><a href="http://svn.gnucash.org/docs/HEAD/"><?=_("Source Docs")?></a></li>
+<li><a href="http://svn.gnucash.org/trac/browser/"><?= _("Browse Source Code")?></a></li>
+<li><a href="http://wiki.gnucash.org/wiki/Subversion"><?= _("Subversion Access")?> </a></li>
+<li><a href="http://wiki.gnucash.org/wiki/Translation"><?=_("Language Translations")?></a></li>
+</ul>
Modified: htdocs/trunk/externals/menu-documentation.phtml
===================================================================
--- htdocs/trunk/externals/menu-documentation.phtml 2006-05-11 02:01:09 UTC (rev 14013)
+++ htdocs/trunk/externals/menu-documentation.phtml 2006-05-11 02:39:13 UTC (rev 14014)
@@ -1,29 +1,25 @@
-<?php
-echo "<span class=\"linktop\">\n";
-echo "<img class=\"dot\" src=\"$top_dir/images/webding.png\" alt=\"marker\">\n";
-echo "<b>" . _("Documentation") . "</b></span>\n";
-echo "<ul>\n";
-echo "<li><a href=\"http://wiki.gnucash.org/wiki/FAQ\">" . _("FAQ") . "</a></li>\n";
-echo "<li><a href=\"http://wiki.gnucash.org/wiki/\">" . _("Wiki") . "</a> ";
-echo "<a href=\"http://linuxwiki.de/GnuCash\">[de]</a></li>\n";
-echo "<li><a href=\"docs.phtml\">Tutorial and Help</a></li>\n";
-
-#echo "<li><a href=\"http://www.gnucash.org/docs/v1.8/C/gnucash-guide\">";
-#echo _("Concepts Guide") . "</a></li>\n";
-#echo "<li>\n";
-#echo "<a href=\"http://www.gnucash.org/docs/v1.8/C/gnucash-help/help.html\">";
+<span class="linktop">
+<img class="dot" src="<?=$top_dir?>/images/webding.png" alt="marker" />
+<b><?=_("Documentation")?></b></span>
+<ul>
+<li><a href="http://wiki.gnucash.org/wiki/FAQ"><?=_("FAQ")?></a></li>
+<li><a href="http://wiki.gnucash.org/wiki/"><?=_("Wiki")?></a>
+ <a href="http://linuxwiki.de/GnuCash">[de]</a></li>
+<li><a href="<?=$home?>/docs.phtml">Tutorial and Help</a></li>
+<!--
+#<li><a href="http://www.gnucash.org/docs/v1.8/C/gnucash-guide">
+#echo _("Concepts Guide")?></a></li>
+#<li>\n
+#<a href="http://www.gnucash.org/docs/v1.8/C/gnucash-help/help.html">
#echo _("Help Manual") . "</a>\n";
-#echo "<a href=\"http://www.gnucash.org/docs/v1.8/de_DE/gnucash-help/help.html\">";
-#echo "[de]</a></li>\n";
-echo "<li><a href=\"http://wiki.gnucash.org/wiki/Mailing_Lists\">";
-echo _("Mailing Lists") . "</a>\n";
-echo "<li style=\"list-style-image:none;list-style-type:none;\"><ul><li>\n";
-echo "<a href=\"https://lists.gnucash.org/search/\">" . _("Search") . "</a>\n";
-echo "</li></ul></li>\n";
-echo "<li><a href=\"http://wiki.gnucash.org/wiki/Bugzilla\">";
-echo _("Bug Reports") . "</a></li>\n";
-echo "<li><a href=\"http://wiki.gnucash.org/wiki/IRC\">";
-echo _("IRC (Chat)") . "</a></li>\n";
-echo "<li><a href=\"http://sourceforge.net/donate/index.php?group_id=192\">" . _("Donations") . "</a></li>\n";
-echo "\n</ul>\n";
-?>
+#<a href="http://www.gnucash.org/docs/v1.8/de_DE/gnucash-help/help.html">
+#[de]</a></li>\n
+-->
+<li><a href="http://wiki.gnucash.org/wiki/Mailing_Lists"><?=_("Mailing Lists")?></a>
+<li style="list-style-image:none;list-style-type:none;"><ul>
+ <li><a href="https://lists.gnucash.org/search/"><?=_("Search")?></a></li>
+ </ul></li>
+<li><a href="http://wiki.gnucash.org/wiki/Bugzilla"><?=_("Bug Reports")?></a></li>
+<li><a href="http://wiki.gnucash.org/wiki/IRC"><?=_("IRC (Chat)")?></a></li>
+<li><a href="http://sourceforge.net/donate/index.php?group_id=192"><?=_("Donations")?></a></li>
+</ul>
Modified: htdocs/trunk/externals/menu-general.phtml
===================================================================
--- htdocs/trunk/externals/menu-general.phtml 2006-05-11 02:01:09 UTC (rev 14013)
+++ htdocs/trunk/externals/menu-general.phtml 2006-05-11 02:39:13 UTC (rev 14014)
@@ -1,12 +1,9 @@
-<?php
-echo "<span class=\"linktop\">\n";
-echo "<img class=\"dot\" src=\"$top_dir/images/webding.png\" alt=\"marker\">\n";
-echo "<b>" . _("Information") . "</b>\n";
-echo "</span>\n";
-echo "<ul>\n";
-echo "<li><a href=\"index.phtml\">" . _("About / News") . " </a></li>\n";
-echo "<li><a href=\"features.phtml\">" . _("Features") . "</a></li>\n";
-echo "<li><a href=\"http://wiki.gnucash.org/wiki/Development\">";
-echo _("How to help") . "</a></li>\n";
-echo "</ul>\n";
-?>
+<span class="linktop">
+<img class="dot" src="<?=$top_dir?>/images/webding.png" alt="marker">
+<b><?= _("Information")?></b>
+</span>
+<ul>
+<li><a href="<?=$home?>/index.phtml"><?= _("About / News")?></a></li>
+<li><a href="<?=$home?>/features.phtml"><?=_("Features")?></a></li>
+<li><a href="http://wiki.gnucash.org/wiki/Development"><?= _("How to help")?></a></li>
+</ul>
Modified: htdocs/trunk/externals/menu-main-developer.phtml
===================================================================
--- htdocs/trunk/externals/menu-main-developer.phtml 2006-05-11 02:01:09 UTC (rev 14013)
+++ htdocs/trunk/externals/menu-main-developer.phtml 2006-05-11 02:39:13 UTC (rev 14014)
@@ -1,27 +1,13 @@
-<!-- MENU:START -->
<?php
$self = $_SERVER["HTTP_HOST"];
if(ereg("lists.gnucash.org",$self)) {
$home = "http://www.gnucash.org";
}
-else {
- $home = ".";
-}
-
-echo "<div id=\"news\">";
-echo "<div id=\"othernews\">";
-include("externals/menu-general.phtml");
-echo "</div>\n<div class=\"othernews\">\n";
-include("externals/menu-documentation.phtml");
-echo "</div>\n<div class=\"othernews\">\n";
-include("externals/menu-downloads.phtml");
-# highlighted menu entry:
-echo "</div>\n<div class=\"highlight\">\n";
-include("externals/menu-developer.phtml");
-echo "</div>\n<div class=\"othernews\">\n";
-include("externals/menu-other.phtml");
-echo "</div>\n";
-echo "</div>\n";
?>
-
-<!-- MENU:END -->
+<div id="news">
+ <div id="othernews"><?php include("externals/menu-general.phtml"); ?></div>
+ <div class="othernews"><?php include("externals/menu-documentation.phtml");?></div>
+ <div class="othernews"><?php include("externals/menu-downloads.phtml");?></div>
+ <div class="highlight"><?php include("externals/menu-developer.phtml");?></div>
+ <div class="othernews"><?php include("externals/menu-other.phtml");?></div>
+</div>
Modified: htdocs/trunk/externals/menu-main-documentation.phtml
===================================================================
--- htdocs/trunk/externals/menu-main-documentation.phtml 2006-05-11 02:01:09 UTC (rev 14013)
+++ htdocs/trunk/externals/menu-main-documentation.phtml 2006-05-11 02:39:13 UTC (rev 14014)
@@ -1,26 +1,13 @@
-<!-- MENU:START -->
-
<?php
$self = $_SERVER["HTTP_HOST"];
if(ereg("lists.gnucash.org",$self)) {
$home = "http://www.gnucash.org";
-} else {
- $home = $top_dir;
}
-
-echo "<div id=\"news\"><div class=\"othernews\">";
-include("$top_dir/externals/menu-general.phtml");
-# highlighted menu entry:
-echo "</div>\n<div class=\"highlight\">\n";
-include("$top_dir/externals/menu-documentation.phtml");
-echo "</div>\n<div class=\"othernews\">\n";
-include("$top_dir/externals/menu-downloads.phtml");
-echo "</div>\n<div class=\"othernews\">\n";
-include("$top_dir/externals/menu-developer.phtml");
-echo "</div>\n<div class=\"othernews\">\n";
-include("$top_dir/externals/menu-other.phtml");
-echo "</div>\n";
-echo "</div>\n";
?>
-
-<!-- MENU:END -->
+<div id="news">
+ <div class="othernews"><?php include("$top_dir/externals/menu-general.phtml");?></div>
+ <div class="highlight"><?php include("$top_dir/externals/menu-documentation.phtml");?></div>
+ <div class="othernews"><?php include("$top_dir/externals/menu-downloads.phtml");?></div>
+ <div class="othernews"><?php include("$top_dir/externals/menu-developer.phtml");?></div>
+ <div class="othernews"><?php include("$top_dir/externals/menu-other.phtml");?></div>
+</div>
Modified: htdocs/trunk/externals/menu-main-general.phtml
===================================================================
--- htdocs/trunk/externals/menu-main-general.phtml 2006-05-11 02:01:09 UTC (rev 14013)
+++ htdocs/trunk/externals/menu-main-general.phtml 2006-05-11 02:39:13 UTC (rev 14014)
@@ -1,27 +1,13 @@
-<!-- MENU:START -->
<?php
$self = $_SERVER["HTTP_HOST"];
if(ereg("lists.gnucash.org",$self)) {
$home = "http://www.gnucash.org";
}
-else {
- $home = ".";
-}
-
-echo "<div id=\"news\">";
-# highlighted menu entry:
-echo "<div class=\"highlight\">";
-include("$top_dir/externals/menu-general.phtml");
-echo "</div>\n\n<div class=\"othernews\">\n";
-include("$top_dir/externals/menu-documentation.phtml");
-echo "</div>\n\n<div class=\"othernews\">\n";
-include("$top_dir/externals/menu-downloads.phtml");
-echo "</div>\n\n<div class=\"othernews\">\n";
-include("$top_dir/externals/menu-developer.phtml");
-echo "</div>\n\n<div class=\"othernews\">\n";
-include("$top_dir/externals/menu-other.phtml");
-echo "</div>\n";
-echo "</div>\n";
?>
-
-<!-- MENU:END -->
+<div id="news">
+ <div class="highlight"><?php include("$top_dir/externals/menu-general.phtml");?></div>
+ <div class="othernews"><?php include("$top_dir/externals/menu-documentation.phtml");?></div>
+ <div class="othernews"><?php include("$top_dir/externals/menu-downloads.phtml");?></div>
+ <div class="othernews"><?php include("$top_dir/externals/menu-developer.phtml");?></div>
+ <div class="othernews"><?php include("$top_dir/externals/menu-other.phtml");?></div>
+</div>
Modified: htdocs/trunk/externals/menu-main-help.phtml
===================================================================
--- htdocs/trunk/externals/menu-main-help.phtml 2006-05-11 02:01:09 UTC (rev 14013)
+++ htdocs/trunk/externals/menu-main-help.phtml 2006-05-11 02:39:13 UTC (rev 14014)
@@ -1,20 +1,7 @@
-<!-- MENU:START -->
-<?php
-
-echo "<div id=\"news\"><div class=\"othernews\">";
-include("externals/menu-general.phtml");
-echo "</div>\n<div class=\"othernews\">\n";
-include("externals/menu-documentation.phtml");
-# highlighted menu entry:
-echo "</div>\n<div class=\"highlight\">\n";
-include("externals/menu-downloads.phtml");
-echo "</div>\n<div class=\"othernews\">\n";
-include("externals/menu-developer.phtml");
-echo "</div>\n<div class=\"othernews\">\n";
-include("externals/menu-other.phtml");
-echo "</div>\n";
-echo "</div>\n";
-?>
-
-
-<!-- MENU:END -->
+<div id="news">
+ <div class="othernews"><?php include("$top_dir/externals/menu-general.phtml");?></div>
+ <div class="othernews"><?php include("$top_dir/externals/menu-documentation.phtml");?></div>
+ <div class="highlight"><?php include("$top_dir/externals/menu-downloads.phtml");?></div>
+ <div class="othernews"><?php include("$top_dir/externals/menu-developer.phtml");?></div>
+ <div class="othernews"><?php include("$top_dir/externals/menu-other.phtml");?></div>
+</div>
Modified: htdocs/trunk/externals/menu-main-other.phtml
===================================================================
--- htdocs/trunk/externals/menu-main-other.phtml 2006-05-11 02:01:09 UTC (rev 14013)
+++ htdocs/trunk/externals/menu-main-other.phtml 2006-05-11 02:39:13 UTC (rev 14014)
@@ -1,26 +1,13 @@
-<!-- MENU:START -->
<?php
$self = $_SERVER["HTTP_HOST"];
if(ereg("lists.gnucash.org",$self)) {
$home = "http://www.gnucash.org";
}
-else {
- $home = $top_dir;
-}
-
-echo "<div id=\"news\"><div class=\"othernews\">";
-include("$top_dir/externals/menu-general.phtml");
-echo "</div>\n<div class=\"othernews\">\n";
-include("$top_dir/externals/menu-documentation.phtml");
-echo "</div>\n<div class=\"othernews\">\n";
-include("$top_dir/externals/menu-downloads.phtml");
-echo "</div>\n<div class=\"othernews\">\n";
-include("$top_dir/externals/menu-developer.phtml");
-# highlighted menu entry:
-echo "</div>\n<div class=\"highlight\">\n";
-include("$top_dir/externals/menu-other.phtml");
-echo "</div>\n";
-echo "</div>\n";
?>
-
-<!-- MENU:END -->
+<div id="news">
+ <div class="othernews"><?php include("$top_dir/externals/menu-general.phtml");?></div>
+ <div class="othernews"><?php include("$top_dir/externals/menu-documentation.phtml");?></div>
+ <div class="othernews"><?php include("$top_dir/externals/menu-downloads.phtml");?></div>
+ <div class="othernews"><?php include("$top_dir/externals/menu-developer.phtml");?></div>
+ <div class="highlight"><?php include("$top_dir/externals/menu-other.phtml");?></div>
+</div>
Modified: htdocs/trunk/externals/menu-main.phtml
===================================================================
--- htdocs/trunk/externals/menu-main.phtml 2006-05-11 02:01:09 UTC (rev 14013)
+++ htdocs/trunk/externals/menu-main.phtml 2006-05-11 02:39:13 UTC (rev 14014)
@@ -1,26 +1,13 @@
-<!-- MENU:START -->
<?php
$self = $_SERVER["HTTP_HOST"];
if(ereg("lists.gnucash.org",$self)) {
$home = "http://www.gnucash.org/";
}
-else {
- $home = ".";
-}
-
-echo "<div id=\"news\">\n";
-# highlighted menu entry:
-echo "<div class=\"highlight\">";
-include("$top_dir/externals/menu-general.phtml");
-echo "</div>\n<div class=\"othernews\">\n";
-include("$top_dir/externals/menu-documentation.phtml");
-echo "</div>\n<div class=\"othernews\">\n";
-include("$top_dir/externals/menu-downloads.phtml");
-echo "</div>\n<div class=\"othernews\">\n";
-include("$top_dir/externals/menu-developer.phtml");
-echo "</div>\n<div class=\"othernews\">\n";
-include("$top_dir/externals/menu-other.phtml");
-echo "</div>\n";
-echo "</div>\n";
?>
-<!-- MENU:END -->
+<div id="news">
+ <div class="highlight"><?php include("$top_dir/externals/menu-general.phtml");?></div>
+ <div class="othernews"><?php include("$top_dir/externals/menu-documentation.phtml");?></div>
+ <div class="othernews"><?php include("$top_dir/externals/menu-downloads.phtml");?></div>
+ <div class="othernews"><?php include("$top_dir/externals/menu-developer.phtml");?></div>
+ <div class="othernews"><?php include("$top_dir/externals/menu-other.phtml");?></div>
+</div>
Modified: htdocs/trunk/externals/menu-other.phtml
===================================================================
--- htdocs/trunk/externals/menu-other.phtml 2006-05-11 02:01:09 UTC (rev 14013)
+++ htdocs/trunk/externals/menu-other.phtml 2006-05-11 02:39:13 UTC (rev 14014)
@@ -1,10 +1,8 @@
-<?php
-echo "<span class=\"linktop\">\n";
-echo "<img class=\"dot\" src=\"$top_dir/images/webding.png\" alt=\"marker\">";
-echo "<b>" . _("Other Information") . "</b>\n";
-echo "</span>\n";
-echo "<ul>\n";
-echo "<li><a href=\"promote.phtml\">" . _("GnuCash Banners!") . "</a></li>\n";
-echo "<li><a href=\"sizing.phtml\">" . _("Sizing") . "</a></li>\n";
-echo "</ul>\n";
-?>
+<span class="linktop">
+<img class="dot" src="<?=$top_dir?>/images/webding.png" alt="marker">
+<b><?=_("Other Information")?></b>
+</span>
+<ul>
+<li><a href="<?=$home?>/promote.phtml"><?=_("GnuCash Banners!")?></a></li>
+<li><a href="<?=$home?>/sizing.phtml"><?=_("Sizing")?></a></li>
+</ul>
More information about the gnucash-changes
mailing list