[Gnucash-changes] r12890 - htdocs/trunk/en - using new variable and removing wrapper tables to use CSS instead

Neil Williams codehelp at cvs.gnucash.org
Thu Jan 19 12:08:49 EST 2006


Author: codehelp
Date: 2006-01-19 12:08:47 -0500 (Thu, 19 Jan 2006)
New Revision: 12890
Trac: http://svn.gnucash.org/trac/changeset/12890

Removed:
   htdocs/trunk/en/gnucash.css
Modified:
   htdocs/trunk/en/architecture.phtml
   htdocs/trunk/en/articles.phtml
   htdocs/trunk/en/bugs.phtml
   htdocs/trunk/en/contribute.phtml
   htdocs/trunk/en/docs.phtml
   htdocs/trunk/en/donations.phtml
   htdocs/trunk/en/features.phtml
   htdocs/trunk/en/features_1.phtml
   htdocs/trunk/en/features_2.phtml
   htdocs/trunk/en/features_3.phtml
   htdocs/trunk/en/features_4.phtml
   htdocs/trunk/en/features_5.phtml
   htdocs/trunk/en/gettext.phtml
   htdocs/trunk/en/hacking.phtml
   htdocs/trunk/en/history.phtml
   htdocs/trunk/en/index.phtml
   htdocs/trunk/en/irc.phtml
   htdocs/trunk/en/links.phtml
   htdocs/trunk/en/lists.phtml
   htdocs/trunk/en/oldnews.phtml
   htdocs/trunk/en/promote.phtml
   htdocs/trunk/en/quiz-results-early.phtml
   htdocs/trunk/en/quiz-results.phtml
   htdocs/trunk/en/quiz.phtml
   htdocs/trunk/en/required.phtml
   htdocs/trunk/en/roadmap.phtml
   htdocs/trunk/en/rss-feed.phtml
   htdocs/trunk/en/screenshots.phtml
   htdocs/trunk/en/search.phtml
   htdocs/trunk/en/sizing.phtml
   htdocs/trunk/en/sql.phtml
   htdocs/trunk/en/state_of_the_gnucash_project.phtml
Log:
using new variable and removing wrapper tables to use CSS instead

Modified: htdocs/trunk/en/architecture.phtml
===================================================================
--- htdocs/trunk/en/architecture.phtml	2006-01-19 17:08:03 UTC (rev 12889)
+++ htdocs/trunk/en/architecture.phtml	2006-01-19 17:08:47 UTC (rev 12890)
@@ -1,10 +1,8 @@
 <?php $title = "Architecture"; ?>
-<?php if (!ini_get('register_globals')) {
- include("../emulate_globals_on.php");
-}
-?>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/externals/en/header.phtml"); ?>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/en/menu/menu-main-developer.phtml"); ?>
+<?php
+include("../emulate_globals_on.php");
+include($toppath."/externals/en/header.phtml");
+include($toppath."/en/menu/menu-main-developer.phtml"); ?>
 <div id="content">
 
 <h1>Architectural Overview</h1>
@@ -38,9 +36,7 @@
 GnuCash currently consists of the following modules:</b>
 </p>
 
-<table border=0 cellpadding=1 cellspacing=0 width="100%">
-  <tr>
-  <td valign=middle align=center bgcolor="#666699">
+<div class="tblborder">
    <table border=0 cellpadding=5 cellspacing=1 bgcolor="#cccccc" width="100%">
    <tr>
      <td bgcolor="#666699" width=25%><font color="#ffffff"><b>Module</b></td>
@@ -319,9 +315,8 @@
 		 </td>
    </tr>
    </table>
-</tr>
-</table>
+</div>
 
 </div>
 
-<?php include($GLOBALS['DOCUMENT_ROOT']."/externals/en/footer.phtml"); ?>
+<?php include($toppath."/externals/en/footer.phtml"); ?>

Modified: htdocs/trunk/en/articles.phtml
===================================================================
--- htdocs/trunk/en/articles.phtml	2006-01-19 17:08:03 UTC (rev 12889)
+++ htdocs/trunk/en/articles.phtml	2006-01-19 17:08:47 UTC (rev 12890)
@@ -1,10 +1,9 @@
 <?php $title = "GnuCash in the News"; ?>
-<?php if (!ini_get('register_globals')) {
- include("../emulate_globals_on.php");
-}
+<?php
+include("../emulate_globals_on.php");
+include($toppath."/externals/en/header.phtml");
+include($toppath."/en/menu/menu-main-other.phtml");
 ?>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/externals/en/header.phtml"); ?>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/en/menu/menu-main-other.phtml"); ?>
 
 <div id="content">
 
@@ -69,7 +68,7 @@
       </dd>
       <dt>
       <b>
-      <a href="http://www.linuxjournal.com/article.php?sid=5669&mode=thread&order=0">
+      <a href="http://www.linuxjournal.com/article.php?sid=5669&amp;mode=thread&amp;order=0">
       Keep Track of Your Money</a></b>
       (<a href="/press-archive/linuxjournal-2002-06/article.php?sid=6559">archival copy</a>)
       (Linux Journal, 8 June 2002)
@@ -136,7 +135,7 @@
       </dd>
       
       <dt>
-      <b><a href="http://www.linuxgram.com/newsitem.phtml?sid=109&aid=10365">
+      <b><a href="http://www.linuxgram.com/newsitem.phtml?sid=109&amp;aid=10365">
       Guns along the Gnome</a></b>
       (<a href="/press-archive/linuxgram-2000-12/newsitem.html">archival copy</a>)
       (Linuxgram, December 2000)
@@ -325,7 +324,7 @@
       </dd>
 
       <dt>
-      <b><a href="http://www.32bitsonline.com/article.php3?file=issues/199902/lj-19990208&page=1">Personal Finance Software</a></b>
+      <b><a href="http://www.32bitsonline.com/article.php3?file=issues/199902/lj-19990208&amp;page=1">Personal Finance Software</a></b>
       (<a href="/press-archive/32bitsonline-1999-02/lj-19990208.html">archival copy</a>)
       (32BitsOnline.com February 1999)
       </dt>
@@ -342,4 +341,4 @@
       </dl>
 
 </div>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/externals/en/footer.phtml"); ?>
+<?php include($toppath."/externals/en/footer.phtml"); ?>

Modified: htdocs/trunk/en/bugs.phtml
===================================================================
--- htdocs/trunk/en/bugs.phtml	2006-01-19 17:08:03 UTC (rev 12889)
+++ htdocs/trunk/en/bugs.phtml	2006-01-19 17:08:47 UTC (rev 12890)
@@ -1,10 +1,8 @@
-<?php $title = "GnuCash Bug Reports"; ?>
-<?php if (!ini_get('register_globals')) {
- include("../emulate_globals_on.php");
-}
+<?php $title = "GnuCash Bug Reports";
+include("../emulate_globals_on.php");
+include($toppath."/externals/en/header.phtml");
+include($toppath."/externals/en/menu-main-help.phtml");
 ?>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/externals/en/header.phtml"); ?>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/externals/en/menu-main-help.phtml"); ?>
 
 <div id="content">
 <h1>GnuCash Bugs at GNOME Bugzilla</h1>
@@ -21,10 +19,10 @@
 and use the forms there to enter your report.<br>
 </p>
 
-<p>
+<div>
 <ul>
 <li><p>
-    <a href="http://bugzilla.gnome.org/buglist.cgi?product=GnuCash&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=NEEDINFO&bug_status=REOPENED&chfieldto=Now&cmdtype=doit&namedcmd=nautilus-backgrounds&order=Reuse+same+sort+as+last+time&form_name=query">Click Here</a>
+    <a href="http://bugzilla.gnome.org/buglist.cgi?product=GnuCash&amp;bug_status=UNCONFIRMED&amp;bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=NEEDINFO&amp;bug_status=REOPENED&amp;chfieldto=Now&amp;cmdtype=doit&amp;namedcmd=nautilus-backgrounds&amp;order=Reuse+same+sort+as+last+time&amp;form_name=query">Click Here</a>
    to see the list of bugs that have been reported but haven't yet
    been fixed.
    </p>
@@ -37,14 +35,14 @@
    Please volunteer your time!)
    </p>
    </li>
-   <p>
-   
-<li><a href="http://bugzilla.gnome.org/buglist.cgi?product=GnuCash">Click here</a> 
-   to see a complete list of all GnuCash bug reports (including old, fixed bugs)</li>
-   <p>
+      
+<li><p>
+<a href="http://bugzilla.gnome.org/buglist.cgi?product=GnuCash">Click here</a> 
+   to see a complete list of all GnuCash bug reports (including old, fixed bugs)
+</p></li>
 </ul>
+</div>
 
-</p>
 </div>
 
-<?php include($GLOBALS['DOCUMENT_ROOT']."/externals/en/footer.phtml"); ?>
+<?php include($toppath."/externals/en/footer.phtml"); ?>

Modified: htdocs/trunk/en/contribute.phtml
===================================================================
--- htdocs/trunk/en/contribute.phtml	2006-01-19 17:08:03 UTC (rev 12889)
+++ htdocs/trunk/en/contribute.phtml	2006-01-19 17:08:47 UTC (rev 12890)
@@ -1,10 +1,9 @@
-<?php $title = "Contribute"; ?>
-<?php if (!ini_get('register_globals')) {
- include("../emulate_globals_on.php");
-}
+<?php 
+$title = "Contribute";
+include("../emulate_globals_on.php");
+include($toppath."/externals/en/header.phtml");
+include($toppath."/en/menu/menu-main-general.phtml");
 ?>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/externals/en/header.phtml"); ?>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/en/menu/menu-main-general.phtml"); ?>
 
 <div id="content">
 
@@ -60,9 +59,9 @@
 <hr>
 <?php
   if ($contribute != "") {
-		include($GLOBALS['DOCUMENT_ROOT']."/en/contribute/contribute-".$contribute.".phtml");
+		include($toppath."/en/contribute/contribute-".$contribute.".phtml");
   }
 ?>
 
 </div>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/externals/en/footer.phtml"); ?>
+<?php include($toppath."/externals/en/footer.phtml"); ?>

Modified: htdocs/trunk/en/docs.phtml
===================================================================
--- htdocs/trunk/en/docs.phtml	2006-01-19 17:08:03 UTC (rev 12889)
+++ htdocs/trunk/en/docs.phtml	2006-01-19 17:08:47 UTC (rev 12890)
@@ -1,10 +1,9 @@
-<?php $title = "Documentation Project"; ?>
-<?php if (!ini_get('register_globals')) {
- include("../emulate_globals_on.php");
-}
+<?php 
+$title = "Documentation Project";
+include("../emulate_globals_on.php");
+include($GLOBALS['DOCUMENT_ROOT']."/externals/en/header.phtml");
+include($GLOBALS['DOCUMENT_ROOT']."/en/menu/menu-main-documentation.phtml");
 ?>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/externals/en/header.phtml"); ?>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/en/menu/menu-main-documentation.phtml"); ?>
 <div id="content">
 
 <h1>GnuCash Documentation Project</h1>
@@ -246,5 +245,5 @@
 
 </div>
 
-<?php include($GLOBALS['DOCUMENT_ROOT']."/externals/en/footer.phtml"); ?>
+<?php include($toppath."/externals/en/footer.phtml"); ?>
 

Modified: htdocs/trunk/en/donations.phtml
===================================================================
--- htdocs/trunk/en/donations.phtml	2006-01-19 17:08:03 UTC (rev 12889)
+++ htdocs/trunk/en/donations.phtml	2006-01-19 17:08:47 UTC (rev 12890)
@@ -2,9 +2,9 @@
 <?php if (!ini_get('register_globals')) {
  include("../emulate_globals_on.php");
 }
+include($toppath."/externals/en/header.phtml");
+include($toppath."/en/menu/menu-main.phtml");
 ?>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/externals/en/header.phtml"); ?>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/en/menu/menu-main.phtml"); ?>
 
 <div id="content">
 
@@ -37,10 +37,7 @@
 of current finances below.  Announcements will be made when funds are
 disbursed; we will keep this web page updated periodically.</p>
 
-<table border="0" cellpadding=1 cellspacing="0" width="100%">
-<colgroup><col></colgroup>
-<tr>
-  <td style="text-align:center;background-color:#666699;">
+<div class="tblborder">
    <table style="border:none;background-color:#cacaf7;"
     cellpadding=5 cellspacing=1 width="100%">
 <colgroup><col width="15%">
@@ -69,8 +66,7 @@
      <td valign="top">$525.95</td>
    </tr>
    </table>
-</tr>
-</table>
+</div>
 
 </div>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/externals/en/footer.phtml"); ?>
+<?php include($toppath."/externals/en/footer.phtml"); ?>

Modified: htdocs/trunk/en/features.phtml
===================================================================
--- htdocs/trunk/en/features.phtml	2006-01-19 17:08:03 UTC (rev 12889)
+++ htdocs/trunk/en/features.phtml	2006-01-19 17:08:47 UTC (rev 12890)
@@ -1,10 +1,9 @@
 <?php $title = "Features"; ?>
-<?php if (!ini_get('register_globals')) {
- include("../emulate_globals_on.php");
-}
+<?php 
+include("../emulate_globals_on.php");
+include($toppath."/externals/en/header.phtml");
+include($toppath."/en/menu/menu-main-general.phtml");
 ?>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/externals/en/header.phtml"); ?>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/en/menu/menu-main-general.phtml"); ?>
 
 <div id="content">
 <h1>Features</h1>

Modified: htdocs/trunk/en/features_1.phtml
===================================================================
--- htdocs/trunk/en/features_1.phtml	2006-01-19 17:08:03 UTC (rev 12889)
+++ htdocs/trunk/en/features_1.phtml	2006-01-19 17:08:47 UTC (rev 12890)
@@ -1,10 +1,9 @@
-<?php $title = "Features"; ?>
-<?php if (!ini_get('register_globals')) {
- include("../emulate_globals_on.php");
-}
+<?php 
+$title = "Features";
+include("../emulate_globals_on.php");
+include($toppath."/externals/en/header.phtml");
+include($toppath."/en/menu/menu-main-general.phtml");
 ?>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/externals/en/header.phtml"); ?>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/en/menu/menu-main-general.phtml"); ?>
 
 <div id="content">
 
@@ -36,4 +35,4 @@
  src="/images/features/features_next.png"></a>
 </div>
 </div>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/externals/en/footer.phtml"); ?>
+<?php include($toppath."/externals/en/footer.phtml"); ?>

Modified: htdocs/trunk/en/features_2.phtml
===================================================================
--- htdocs/trunk/en/features_2.phtml	2006-01-19 17:08:03 UTC (rev 12889)
+++ htdocs/trunk/en/features_2.phtml	2006-01-19 17:08:47 UTC (rev 12890)
@@ -1,10 +1,9 @@
-<?php $title = "Features:Ease of Use"; ?>
-<?php if (!ini_get('register_globals')) {
- include("../emulate_globals_on.php");
-}
+<?php 
+$title = "Features:Ease of Use";
+include("../emulate_globals_on.php");
+include($toppath."/externals/en/header.phtml");
+include($toppath."/en/menu/menu-main-general.phtml");
 ?>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/externals/en/header.phtml"); ?>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/en/menu/menu-main-general.phtml"); ?>
 </div>
 <div id="content">
 
@@ -35,4 +34,4 @@
 </div>
 
 </div>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/externals/en/footer.phtml"); ?>
+<?php include($toppath."/externals/en/footer.phtml"); ?>

Modified: htdocs/trunk/en/features_3.phtml
===================================================================
--- htdocs/trunk/en/features_3.phtml	2006-01-19 17:08:03 UTC (rev 12889)
+++ htdocs/trunk/en/features_3.phtml	2006-01-19 17:08:47 UTC (rev 12890)
@@ -1,10 +1,9 @@
-<?php $title = "Features: Ease of Use"; ?>
-<?php if (!ini_get('register_globals')) {
- include("../emulate_globals_on.php");
-}
+<?php 
+$title = "Features: Ease of Use";
+include("../emulate_globals_on.php");
+include($toppath."/externals/en/header.phtml");
+include($toppath."/en/menu/menu-main-general.phtml");
 ?>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/externals/en/header.phtml"); ?>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/en/menu/menu-main-general.phtml"); ?>
 </div>
 <div id="content">
 
@@ -33,4 +32,4 @@
 </div>
 
 </div>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/externals/en/footer.phtml"); ?>
+<?php include($toppath."/externals/en/footer.phtml"); ?>

Modified: htdocs/trunk/en/features_4.phtml
===================================================================
--- htdocs/trunk/en/features_4.phtml	2006-01-19 17:08:03 UTC (rev 12889)
+++ htdocs/trunk/en/features_4.phtml	2006-01-19 17:08:47 UTC (rev 12890)
@@ -1,10 +1,9 @@
-<?php $title = "Features: Ease of Use"; ?>
-<?php if (!ini_get('register_globals')) {
- include("../emulate_globals_on.php");
-}
+<?php 
+$title = "Features: Ease of Use";
+include("../emulate_globals_on.php");
+include($toppath."/externals/en/header.phtml");
+include($toppath."/en/menu/menu-main-general.phtml");
 ?>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/externals/en/header.phtml"); ?>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/en/menu/menu-main-general.phtml"); ?>
 </div>
 <div id="content">
 
@@ -34,4 +33,4 @@
 </div>
 </div>
 
-<?php include($GLOBALS['DOCUMENT_ROOT']."/externals/en/footer.phtml"); ?>
+<?php include($toppath."/externals/en/footer.phtml"); ?>

Modified: htdocs/trunk/en/features_5.phtml
===================================================================
--- htdocs/trunk/en/features_5.phtml	2006-01-19 17:08:03 UTC (rev 12889)
+++ htdocs/trunk/en/features_5.phtml	2006-01-19 17:08:47 UTC (rev 12890)
@@ -1,10 +1,9 @@
-<?php $title = "Features: What's New"; ?>
-<?php if (!ini_get('register_globals')) {
- include("../emulate_globals_on.php");
-}
+<?php 
+$title = "Features: What's New";
+include("../emulate_globals_on.php");
+include($toppath."/externals/en/header.phtml");
+include($toppath."/en/menu/menu-main-general.phtml");
 ?>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/externals/en/header.phtml"); ?>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/en/menu/menu-main-general.phtml"); ?>
 <div id="content">
 
 <div>
@@ -182,4 +181,4 @@
 </table>
 </div>
 
-<?php include($GLOBALS['DOCUMENT_ROOT']."/externals/en/footer.phtml"); ?>
+<?php include($toppath."/externals/en/footer.phtml"); ?>

Modified: htdocs/trunk/en/gettext.phtml
===================================================================
--- htdocs/trunk/en/gettext.phtml	2006-01-19 17:08:03 UTC (rev 12889)
+++ htdocs/trunk/en/gettext.phtml	2006-01-19 17:08:47 UTC (rev 12890)
@@ -20,8 +20,4 @@
 echo gettext("This should all be translated. If you see this message in the 
 language you entered, it works");
 ?>
-<?php if (!ini_get('register_globals')) {
- include("../emulate_globals_on.php");
-}
-?>
 

Deleted: htdocs/trunk/en/gnucash.css
===================================================================
--- htdocs/trunk/en/gnucash.css	2006-01-19 17:08:03 UTC (rev 12889)
+++ htdocs/trunk/en/gnucash.css	2006-01-19 17:08:47 UTC (rev 12890)
@@ -1,44 +0,0 @@
-body    { 
-	font-family: verdana,arial,helvetica,sans-serif; 
-	color: #000000; 
-	background: #ffffff; 
-	margin-left: 0%; 
-	margin-right: 0%;
-	margin-top: 0%; 
-	margin-bottom: 0%;
-}
-td      { font-family: verdana,arial,helvetica,sans-serif; }
-dl      { font-family: verdana,arial,helvetica,sans-serif; }
-pre     { font-family: courier new, courier; }
-form    { font-family: helvetica,arial,sans-serif; }
-i       { font-style: italic; }
-b       { font-style: bold; }
-hl      { font-family: verdana,arial,helvetica,sans-serif; font-style: bold; }
-small   { font-size: smaller; }
-font.high          { font-family: courier new, courier; color: #000000; background-color: #ffff66;}
-font.high2         { background-color: #ffff66;}
-font.comment       { font-family: courier new, courier; font-style: italic; color: green;}
-font.preprocessor  { font-family: courier new, courier; color: blue;}
-font.storagekw     { font-family: courier new, courier; color: red;}
-font.constant      { font-family: courier new, courier; color: green;}
-font.num           { font-family: courier new, courier; font-style: normal; color: #000000;}
-a.nav              { font-family: verdana,arial,helvetica,sans-serif; color: #FFFFFF; }
-
-.text { font-size: 12pt; font-family: verdana,arial,helvetica,sans-serif; }
-.smalltext { font-size: 10pt; font-family: verdana,arial,helvetica,sans-serif; }
-
-.text10 { font-size: 10pt; font-family: verdana,arial,helvetica,sans-serif; }
-.text12 { font-size: 12pt; font-family: verdana,arial,helvetica,sans-serif; }
-.text14 { font-size: 14pt; font-family: verdana,arial,helvetica,sans-serif; }
-
-
-#feature_box {
-	width: '100%';
-
-	/*margin-right: 10px;*/
-	padding-right: 10px;
-	padding-bottom: 0px;
-	border-left: 1px dashed #dddddd;
-	background-color: #ffffff;
-}
-

Modified: htdocs/trunk/en/hacking.phtml
===================================================================
--- htdocs/trunk/en/hacking.phtml	2006-01-19 17:08:03 UTC (rev 12889)
+++ htdocs/trunk/en/hacking.phtml	2006-01-19 17:08:47 UTC (rev 12890)
@@ -1,10 +1,9 @@
-<?php $title = "Hacking"; ?>
-<?php if (!ini_get('register_globals')) {
- include("../emulate_globals_on.php");
-}
+<?php 
+$title = "Hacking";
+include("../emulate_globals_on.php");
+include($toppath."/externals/en/header.phtml");
+include($toppath."/en/menu/menu-main-developer.phtml");
 ?>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/externals/en/header.phtml"); ?>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/en/menu/menu-main-developer.phtml"); ?>
 
 </div>
 <div id="content">
@@ -207,4 +206,4 @@
 </p>
 
 
-<?php include($GLOBALS['DOCUMENT_ROOT']."/externals/en/footer.phtml"); ?>
+<?php include($toppath."/externals/en/footer.phtml"); ?>

Modified: htdocs/trunk/en/history.phtml
===================================================================
--- htdocs/trunk/en/history.phtml	2006-01-19 17:08:03 UTC (rev 12889)
+++ htdocs/trunk/en/history.phtml	2006-01-19 17:08:47 UTC (rev 12890)
@@ -1,10 +1,9 @@
-<?php $title = "History"; ?>
-<?php if (!ini_get('register_globals')) {
- include("../emulate_globals_on.php");
-}
+<?php 
+$title = "History"; 
+include("../emulate_globals_on.php");
+include($toppath."/externals/en/header.phtml");
+include($toppath."/en/menu/menu-main-other.phtml");
 ?>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/externals/en/header.phtml"); ?>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/en/menu/menu-main-other.phtml"); ?>
 
 <div id="content">
 
@@ -23,6 +22,7 @@
   <b>Robin Clark</b>
   </dt>
   <dd>
+<div class="history">
     wrote the original 
     <a href="http://www.cs.hmc.edu/~rclark/xacc/">X-Accountant</a>
     (<a href="http://www.gnucash.org/mirrors/www.cs.hmc.edu/~rclark/xacc/">mirror</a>)
@@ -30,15 +30,15 @@
     taking it to version 0.9 by October 1997.  Although every single 
     line of his code has been re-written, his name appears as a 
     credit in almost every file.  Such is the magic of copyrights.
+</div>
+
   </dd>
 
-<BR>
-<BR>
-
   <dt>
   <b>Linas Vepstas</b> (<a href="/images/people/linas-at-kims.jpg">photo</a>)
   </dt>
   <dd>
+<div class="history">
     liked what he saw: the GUI was slick, the code was documented and 
     well structured, and it was all GPL'ed. And so he re-wrote it: 
     adding cell-widgets to XbaeMatrix, so that the combobox and arrows 
@@ -51,15 +51,15 @@
     Linas is now active with Gnumatic Incorporated, a company formed to 
     enhance and support GnuCash for everyone, from home desktop users 
     to commercial and professional accountants.
+</div>
   </dd>
 
-<BR>
-<BR>
 
   <dt>
   <b>Jeremy Collins</b> 
   </dt>
   <dd>
+<div class="history">
     publicized the GnoMoney project widely and broadly, and then 
     changed its name to GnuCash.   (Actually, put the selection 
     of the name up to popular vote.  Democracy is <b>not</b>
@@ -68,15 +68,15 @@
     the gnucash.org web site for years,
     and got the initial GTK/gnome code working.  
     The newest website design is Jeremy's as well.
+</div>
   </dd>
 
-<BR>
-<BR>
 
   <dt>
   <b>Rob Browning</b> (<a href="/images/people/browning.srl.jpg">photo</a>)
   </dt>
   <dd>
+<div class="history">
     abused everyone for not using Perl, and then after we added Perl support, 
     dumped Perl in favor of Guile/Scheme support. Rob maintined the 
     build infrastructure for a while, added user preferences, 
@@ -90,80 +90,82 @@
     specialized in robotics and computer vision. 
     The photo shows him as a volunteer, putting up
     the microwave link for SRL's exploding circus.
+</div>
   </dd>
 
-<BR>
-<BR>
 
   <dt>
   <b>Yannick Le Ny</b>
   </dt>
   <dd>
+<div class="history">
     Our French translator.
     He has translated the menus, messages, README and the documentation to French.
     He strung up the French translation to the GnuCash website, working hard 
     to keep it up to date.
     Patches for Yahoo Europe to get stocks quotes.
+</div>
   </dd>
 
-<BR>
-<BR>
 
   <dt>
   <b>Dave Peticolas</b> (<a href="/images/people/peticolas.jpg">photo</a>)
   </dt>
   <dd>
+<div class="history">
     hacks obsessively on GnuCash. But he can stop anytime he wants to. Really. 
     (As he is now the gatekeeper of the GnuCash CVS tree, be nice to him,
     or he may decide to stop hacking in the middle of your patch).
+</div>
   </dd>
 
-<BR>
-<BR>
 
   <dt>
   <b>Bill Gribble</b>
   </dt>
   <dd>
+<div class="history">
     is not shy, or softly spoken.  So don't be shy if you find a bug in 
     his code: QIF import, query API and transaction search, check-printing,
     commodity and currency support, gtkhtml integration and report printing,
     pgp support, guppi integration, and the new main window layout.
+</div>
   </dd>
 
 
-<BR>
-<BR>
-
   <dt>
   <b>Robert Graham Merkel</b>
   </dt>
   <dd>
+<div class="history">
     Reporting, gnome, and config patches
+</div>
   </dd>
 
-<BR>
-<BR>
 
   <dt>
   <b>James LewisMoss</b>
   </dt>
   <dd>
+<div class="history">
     XML Refactoring.  Automated test suite.
+</div>
   </dd>
 
 
-<BR>
-<BR>
 <dt><b>Carol Champagne</b></dt>
-<dd>First draft of the GnuCash User's Guide</dd>
-<BR>
-<BR>
+<dd>
+<div class="history">
+First draft of the GnuCash User's Guide
+</div>
+</dd>
 
+
   <dt>
   <b>Christian Stimming</b> (<a href="/images/people/cstim2.jpg">photo</a>)
   </dt>
   <dd>
+<div class="history">
     used to be the report-generating monster, when he
     created most of the graphical reports and added multi-currency support
     to the reports in general. Lately he implemented support of HBCI, the
@@ -171,49 +173,64 @@
     Germany. Currently he is the internationalization guru, overseeing the
     translation of gnucash into as many languages as there are translators
     around.
+</div>
   </dd>
 
-<BR>
-<BR>
+
 <dt><b>Derek Atkins</b> (<a href="/images/people/warlord8.tif">photo</a>) 
     (<a href="/images/people/warlord.jpg">photo</a>) </dt>
-<dd>Warlord created the RPC backend for starters, and has been the 
-    lead developer of the small business features.</dd>
-<BR>
-<BR>
+<dd>
+<div class="history">
+Warlord created the RPC backend for starters, and has been the 
+    lead developer of the small business features.
+</div>
+</dd>
+
+
 <dt><strong>Joshua Sled</strong> 
     (<a href="/images/people/jsled-me-best.jpg">photo</a>)</dt>
-<dd>jsled got really excited about adding budgeting support and a
+<dd>
+<div class="history">
+    jsled got really excited about adding budgeting support and a
     financial-planning workbench into GnuCash, and realized how poor his
     time-estimation skills were while adding Scheduled Transactions support
     into GnuCash 1.8.0.  Currently in a high-time-commitment startup job,
     he hopes to return to Budgeting in a FutureRelease, he hopes that enough
     people will add scheduled transactions into their data files to be a good
     initial data-set for budgeting/analysis when it's available.
+</div>
 </dd>
 
-<BR>
-<BR>
+
 <dt><b>Chris Lyttle</b> (<a href="/images/people/wilddev.jpg">photo</a>) </dt>
-<dd>wilddev</dd>
-<BR>
-<BR>
+<dd>
+<div class="history">
+wilddev
+</div></dd>
+
+
 <dt><b>David Hampton</b> (<a href="/images/people/hampton.jpg">photo</a>) </dt>
-<dd></dd>
-<BR>
-<BR>
+<dd>
+<div class="history">
+
+</div>
+</dd>
+
+
 <dt><b>Benoit Gregoire</b></dt>
-<dd>created libOFX, thereby enabling GnuCash to understand the
-    OFX (Open Financial Exchange) protocol and file format.</dd>
-<BR>
-<BR>
+<dd>
+<div class="history">
+    created libOFX, thereby enabling GnuCash to understand the
+    OFX (Open Financial Exchange) protocol and file format.
+</div>
+</dd>
 
 </dl>
 
 <BR>
 
 
-<font size="+2"><b>Fixers and Patchers</b></font>
+<h2>Fixers and Patchers</h2>
 <hr>
 (In Alphabetical Order)
 
@@ -318,4 +335,4 @@
 </dl>
 
 </div>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/externals/en/footer.phtml"); ?>
+<?php include($toppath."/externals/en/footer.phtml"); ?>

Modified: htdocs/trunk/en/index.phtml
===================================================================
--- htdocs/trunk/en/index.phtml	2006-01-19 17:08:03 UTC (rev 12889)
+++ htdocs/trunk/en/index.phtml	2006-01-19 17:08:47 UTC (rev 12890)
@@ -1,10 +1,10 @@
-<?php $title = "Open Source Accounting Software"; ?>
-<?php if (!ini_get('register_globals')) {
- include("../emulate_globals_on.php");
-}
+<?php 
+$title = "Open Source Accounting Software";
+$homepage=true;
+include("../emulate_globals_on.php");
+include($toppath."/externals/en/header.phtml");
+include($toppath."/en/menu/menu-main.phtml"); 
 ?>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/externals/en/header.phtml"); ?>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/en/menu/menu-main.phtml"); ?>
 
 <div id="content">
 
@@ -39,8 +39,8 @@
   # for english, the native and alt news path are identical
   $native_newspath  =  "news/";
   $alt_newspath  =  "news/";
-  include($GLOBALS['DOCUMENT_ROOT']."/php-scripts/news-script.php"); ?>
+  include($toppath."/php-scripts/news-script.php"); ?>
 
 </div>
 
-<?php include($GLOBALS['DOCUMENT_ROOT']."/externals/en/footer.phtml"); ?>
+<?php include($toppath."/externals/en/footer.phtml"); ?>

Modified: htdocs/trunk/en/irc.phtml
===================================================================
--- htdocs/trunk/en/irc.phtml	2006-01-19 17:08:03 UTC (rev 12889)
+++ htdocs/trunk/en/irc.phtml	2006-01-19 17:08:47 UTC (rev 12890)
@@ -1,11 +1,9 @@
-
-<?php $title = "GnuCash on IRC"; ?>
-<?php if (!ini_get('register_globals')) {
- include("../emulate_globals_on.php");
-}
+<?php 
+$title = "GnuCash on IRC";
+include("../emulate_globals_on.php");
+include($toppath."/externals/en/header.phtml");
+include($toppath."/externals/en/menu-main-help.phtml");
 ?>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/externals/en/header.phtml"); ?>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/externals/en/menu-main-help.phtml"); ?>
 
 <div id="content">
 
@@ -16,4 +14,4 @@
 on IRC.  Join the #gnucash channel at irc.gnome.org.
 </div>
 
-<?php include($GLOBALS['DOCUMENT_ROOT']."/externals/en/footer.phtml"); ?>
+<?php include($toppath."/externals/en/footer.phtml"); ?>

Modified: htdocs/trunk/en/links.phtml
===================================================================
--- htdocs/trunk/en/links.phtml	2006-01-19 17:08:03 UTC (rev 12889)
+++ htdocs/trunk/en/links.phtml	2006-01-19 17:08:47 UTC (rev 12890)
@@ -1,20 +1,19 @@
-<?php $title = "Related Financial Software"; ?>
-<?php if (!ini_get('register_globals')) {
- include("../emulate_globals_on.php");
-}
+<?php 
+$title = "Related Financial Software";
+include("../emulate_globals_on.php");
+include($toppath."/externals/en/header.phtml");
+include($toppath."/en/menu/menu-main-other.phtml");
 ?>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/externals/en/header.phtml"); ?>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/en/menu/menu-main-other.phtml"); ?>
 
 <div id="content">
 
 <h1>Related Financial Software</h1>
 
-<table>
-<tr><td>
-<b>Select a section:</b></td>
-<td>
+<div>
+<p><b>Select a section:</b>
+</p>
 <form method=post>
+<div>
 <select name=linkpage>
   <option value=general
   <?php if ($linkpage == "general") { echo ("selected"); } ?>
@@ -27,7 +26,7 @@
   >Palm Computing</option>
   <option value=stock
   <?php if ($linkpage == "stock") { echo ("selected"); } ?>
-  >Stock Trading & Technical Analysis</option>
+  >Stock Trading &amp; Technical Analysis</option>
   <option value=quote
   <?php if ($linkpage == "quote") { echo ("selected"); } ?>
   >Quote Sources, Tools</option>
@@ -48,20 +47,20 @@
   >Historical References</option>
   <option value=review
   <?php if ($linkpage == "review") { echo ("selected"); } ?>
-  >Gnucash Review & Rating Sites</option>
+  >Gnucash Review &amp; Rating Sites</option>
 </select>
 <input type=submit value=Go>
-</td>
-</table>
+</div>
 </form>
+</div>
 
 <?php
   if ($linkpage != "") { 
-	include($GLOBALS['DOCUMENT_ROOT']."/en/links/links-".$linkpage.".phtml");
+	include($toppath."/en/links/links-".$linkpage.".phtml");
   } else {
-	include($GLOBALS['DOCUMENT_ROOT']."/en/links/links-general.phtml");
+	include($toppath."/en/links/links-general.phtml");
   }
 ?>
 
 </div>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/externals/en/footer.phtml"); ?>
+<?php include($toppath."/externals/en/footer.phtml"); ?>

Modified: htdocs/trunk/en/lists.phtml
===================================================================
--- htdocs/trunk/en/lists.phtml	2006-01-19 17:08:03 UTC (rev 12889)
+++ htdocs/trunk/en/lists.phtml	2006-01-19 17:08:47 UTC (rev 12890)
@@ -1,10 +1,9 @@
-<?php $title = "Mailing Lists"; ?>
-<?php if (!ini_get('register_globals')) {
- include("../emulate_globals_on.php");
-}
+<?php 
+$title = "Mailing Lists"; 
+include("../emulate_globals_on.php");
+include($toppath."/externals/en/header.phtml");
+include($toppath."/externals/en/menu-main-help.phtml");
 ?>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/externals/en/header.phtml"); ?>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/externals/en/menu-main-help.phtml"); ?>
 
 <div id="content">
 
@@ -15,9 +14,7 @@
 the bold type for instructions on how to subscribe and unsubscribe.
 </p>
 
-<table border="0" cellpadding=1 cellspacing="0" width="100%">
-  <tr>
-  <td style="text-align:center;background-color:#666699">
+<div class="tblborder">
    <table border="0" cellpadding=5 cellspacing=1
     style="background-color:#cacaf7" width="100%">
 <colgroup><col width="40%"><col width="60%"></colgroup>
@@ -220,8 +217,7 @@
    </tr>
 
    </table>
-</tr>
-</table>
+</div>
 
 </div>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/externals/en/footer.phtml"); ?>
+<?php include($toppath."/externals/en/footer.phtml"); ?>

Modified: htdocs/trunk/en/oldnews.phtml
===================================================================
--- htdocs/trunk/en/oldnews.phtml	2006-01-19 17:08:03 UTC (rev 12889)
+++ htdocs/trunk/en/oldnews.phtml	2006-01-19 17:08:47 UTC (rev 12890)
@@ -1,11 +1,9 @@
-
-<?php $title = "Accounting Software for Linux"; ?>
-<?php if (!ini_get('register_globals')) {
- include("../emulate_globals_on.php");
-}
+<?php 
+$title = "Accounting Software for Linux";
+include("../emulate_globals_on.php");
+include($toppath."/externals/en/header.phtml");
+include($toppath."/en/menu/menu-main.phtml");
 ?>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/externals/en/header.phtml"); ?>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/en/menu/menu-main.phtml"); ?>
 <div id="content">
 
 <h1>Older Announcements</h1>
@@ -19,9 +17,9 @@
     # indicate where to get translated news from ... 
     $native_newspath  =  "../news/old/";
     $alt_newspath  =  "../news/old/";
-    include($GLOBALS['DOCUMENT_ROOT']."/php-scripts/news-script.php");
+    include($toppath."/php-scripts/news-script.php");
     ?>  
 </div>
 
-<?php include($GLOBALS['DOCUMENT_ROOT']."/externals/en/footer.phtml"); ?>
+<?php include($toppath."/externals/en/footer.phtml"); ?>
 

Modified: htdocs/trunk/en/promote.phtml
===================================================================
--- htdocs/trunk/en/promote.phtml	2006-01-19 17:08:03 UTC (rev 12889)
+++ htdocs/trunk/en/promote.phtml	2006-01-19 17:08:47 UTC (rev 12890)
@@ -1,10 +1,9 @@
-<?php $title = "Promote GnuCash"; ?>
-<?php if (!ini_get('register_globals')) {
- include("../emulate_globals_on.php");
-}
+<?php 
+$title = "Promote GnuCash"; 
+include("../emulate_globals_on.php");
+include($toppath."/externals/en/header.phtml");
+include($toppath."/en/menu/menu-main-other.phtml");
 ?>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/externals/en/header.phtml"); ?>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/en/menu/menu-main-other.phtml"); ?>
 <div id="content">
 
 <p><b>Promote GnuCash</b></p>
@@ -105,5 +104,5 @@
 </p>
 
 </div>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/externals/en/footer.phtml"); ?>
+<?php include($toppath."/externals/en/footer.phtml"); ?>
 

Modified: htdocs/trunk/en/quiz-results-early.phtml
===================================================================
--- htdocs/trunk/en/quiz-results-early.phtml	2006-01-19 17:08:03 UTC (rev 12889)
+++ htdocs/trunk/en/quiz-results-early.phtml	2006-01-19 17:08:47 UTC (rev 12890)
@@ -1,10 +1,9 @@
-<?php $title = "Survey"; ?>
-<?php if (!ini_get('register_globals')) {
- include("../emulate_globals_on.php");
-}
+<?php 
+$title = "Survey";
+include("../emulate_globals_on.php");
+include($toppath."/externals/en/header.phtml");
+include($toppath."/en/menu/menu-main-other.phtml");
 ?>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/externals/en/header.phtml"); ?>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/en/menu/menu-main-other.phtml"); ?>
 </div>
 <div id="content">
 
@@ -2606,4 +2605,4 @@
   </TR>
 </TABLE>
 
-<?php include($GLOBALS['DOCUMENT_ROOT']."/externals/en/footer.phtml"); ?>
+<?php include($toppath."/externals/en/footer.phtml"); ?>

Modified: htdocs/trunk/en/quiz-results.phtml
===================================================================
--- htdocs/trunk/en/quiz-results.phtml	2006-01-19 17:08:03 UTC (rev 12889)
+++ htdocs/trunk/en/quiz-results.phtml	2006-01-19 17:08:47 UTC (rev 12890)
@@ -1,10 +1,8 @@
-<?php $title = "Survey"; ?>
-<?php if (!ini_get('register_globals')) {
- include("../emulate_globals_on.php");
-}
+<?php $title = "Survey"; 
+include("../emulate_globals_on.php");
+include($toppath."/externals/en/header.phtml");
+include($toppath."/en/menu/menu-main-other.phtml");
 ?>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/externals/en/header.phtml"); ?>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/en/menu/menu-main-other.phtml"); ?>
 
 <div id="content">
 
@@ -2811,4 +2809,4 @@
         </TR>
       </TABLE>
 </div>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/externals/en/footer.phtml"); ?>
+<?php include($toppath."/externals/en/footer.phtml"); ?>

Modified: htdocs/trunk/en/quiz.phtml
===================================================================
--- htdocs/trunk/en/quiz.phtml	2006-01-19 17:08:03 UTC (rev 12889)
+++ htdocs/trunk/en/quiz.phtml	2006-01-19 17:08:47 UTC (rev 12890)
@@ -1,10 +1,9 @@
-<?php $title = "Survey"; ?>
-<?php if (!ini_get('register_globals')) {
- include("../emulate_globals_on.php");
-}
+<?php 
+$title = "Survey"; 
+include("../emulate_globals_on.php");
+include($toppath."/externals/en/header.phtml");
+include($toppath."/en/menu/menu-main-general.phtml");
 ?>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/externals/en/header.phtml"); ?>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/en/menu/menu-main-general.phtml"); ?>
 
 </div>
 <div id="content">
@@ -57,4 +56,4 @@
 <?php $sid=2;
        include("/home/httpd/tools/phpESP-1.2beta3/public/handler.php");?> 
 
-<?php include($GLOBALS['DOCUMENT_ROOT']."/externals/en/footer.phtml"); ?>
+<?php include($toppath."/externals/en/footer.phtml"); ?>

Modified: htdocs/trunk/en/required.phtml
===================================================================
--- htdocs/trunk/en/required.phtml	2006-01-19 17:08:03 UTC (rev 12889)
+++ htdocs/trunk/en/required.phtml	2006-01-19 17:08:47 UTC (rev 12890)
@@ -1,10 +1,9 @@
 <?php $title = "Software Requirements"; ?>
-<?php if (!ini_get('register_globals')) {
- include("../emulate_globals_on.php");
-}
+<?php
+include("../emulate_globals_on.php");
+include($toppath."/externals/en/header.phtml");
+include($toppath."/en/menu/menu-main-general.phtml");
 ?>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/externals/en/header.phtml"); ?>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/en/menu/menu-main-general.phtml"); ?>
 
 <div id="content">
 
@@ -37,10 +36,7 @@
 href="#gwrap">G-Wrap</a>.
 <br><br>
 
-<table border="0" cellpadding=1 cellspacing=0 width="100%">
-<colgroup><col></colgroup>
-  <tr>
-  <td style="background-color:#666699;text-align:center">
+<div class="tblborder">
    <table border=0 cellpadding=5 cellspacing=1
     style="background-color:#cacaf7" width="100%">
 <colgroup><col width="20%">
@@ -347,8 +343,7 @@
    </tr>
 
    </table>
-</tr>
-</table>
+</div>
 
 </div>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/externals/en/footer.phtml"); ?>
+<?php include($toppath."/externals/en/footer.phtml"); ?>

Modified: htdocs/trunk/en/roadmap.phtml
===================================================================
--- htdocs/trunk/en/roadmap.phtml	2006-01-19 17:08:03 UTC (rev 12889)
+++ htdocs/trunk/en/roadmap.phtml	2006-01-19 17:08:47 UTC (rev 12890)
@@ -1,10 +1,9 @@
 <?php $title = "Roadmap"; ?>
-<?php if (!ini_get('register_globals')) {
- include("../emulate_globals_on.php");
-}
+<?php
+include("../emulate_globals_on.php");
+include($toppath."/externals/en/header.phtml");
+include($toppath."/en/menu/menu-main-developer.phtml");
 ?>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/externals/en/header.phtml"); ?>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/en/menu/menu-main-developer.phtml"); ?>
 <div id="content">
 
 <h1>The Road Ahead</h1>
@@ -172,7 +171,7 @@
 <dt><b>Napster for Money</b>
 <dd>If you thought the music industry hated Napster, just wait till 
     you see 
-    <a href="http://slashdot.org/article.pl?sid=01/03/30/1953235&mode=thread">
+    <a href="http://slashdot.org/article.pl?sid=01/03/30/1953235&amp;mode=thread">
     how the feds and the banks react to its financial equivalent</a>.  
     Suppose there
     really were an infrastructure for putting secure, anonymous eCash
@@ -228,4 +227,4 @@
 
 </div>
 
-<?php include($GLOBALS['DOCUMENT_ROOT']."/externals/en/footer.phtml"); ?>
+<?php include($toppath."/externals/en/footer.phtml"); ?>

Modified: htdocs/trunk/en/rss-feed.phtml
===================================================================
--- htdocs/trunk/en/rss-feed.phtml	2006-01-19 17:08:03 UTC (rev 12889)
+++ htdocs/trunk/en/rss-feed.phtml	2006-01-19 17:08:47 UTC (rev 12890)
@@ -1,7 +1,4 @@
-<?php if (!ini_get('register_globals')) {
- include("../emulate_globals_on.php");
-}
-?>
+<?php include("../emulate_globals_on.php"); ?>
 <?php
    // This file reads the news items in the /news directory and turns
    // them into Dave Winer RSS-2.0 specification news items.
@@ -52,16 +49,8 @@
         return $line;
     }
 
-    //  change  this  to  the  directory  of  your  news  files 
-    //  they  should  be  plain  ASCII  text  files  with  extension  ".txt" 
+    $newspath  =  "$topdir/news/"; 
 
-    # Perhaps we should be using this, but it won't work until we have
-    # the DocumentRoot set up.
-    # $newspath = $GLOBALS['DOCUMENT_ROOT']."/news/
-
-    # So we'll just do this for now...
-    $newspath  =  "news/"; 
-
     //  Declare  array  to  hold  filenames 
     $newsfile  =  array(); 
     

Modified: htdocs/trunk/en/screenshots.phtml
===================================================================
--- htdocs/trunk/en/screenshots.phtml	2006-01-19 17:08:03 UTC (rev 12889)
+++ htdocs/trunk/en/screenshots.phtml	2006-01-19 17:08:47 UTC (rev 12890)
@@ -1,17 +1,14 @@
 <?php $title = "Screenshots"; ?>
-<?php if (!ini_get('register_globals')) {
- include("../emulate_globals_on.php");
-}
+<?php
+include("../emulate_globals_on.php");
+include($toppath."/externals/en/header.phtml");
+include($toppath."/en/menu/menu-main-general.phtml");
 ?>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/externals/en/header.phtml"); ?>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/en/menu/menu-main-general.phtml"); ?>
 <div id="content">
 
 <h1>Screenshots</h1>
 
-<table border=0 cellpadding=1 cellspacing=0 width="100%">
-  <tr>
-  <td valign=middle align=center bgcolor="#666699">
+<div class="tblborder">
    <table border=0 cellpadding=5 cellspacing=1 bgcolor="#cacaf7" width="100%">
    <tr>
      <td bgcolor="#666699" width="25%"><font color="#ffffff"><b>Screenshot</b></td>
@@ -19,7 +16,7 @@
      <td bgcolor="#666699" width="75%"><font color="#ffffff"><b>Thumbnail</b></td>
    </tr>
 <?php
-	$d = dir($GLOBALS['DOCUMENT_ROOT']."/images/gnome-1.6/");
+	$d = dir($toppath."/images/gnome-1.6/");
 	while($entry=$d->read()) {
 	  if(ereg("-thumb", $entry)) { continue; }
 	  if(!ereg("gif$", $entry)) { continue; }
@@ -27,8 +24,8 @@
 		$file_clean = explode(".", $entry);
 		$entry = $file_clean[0]."-thumb";
 	  
-	  $description = implode("", file($GLOBALS['DOCUMENT_ROOT']."/images/gnome-1.6/".$entry.".gif.description")); 
-		$name = implode("", file($GLOBALS['DOCUMENT_ROOT']."/images/gnome-1.6/".$entry.".gif.name"));
+	  $description = implode("", file($toppath."/images/gnome-1.6/".$entry.".gif.description")); 
+		$name = implode("", file($toppath."/images/gnome-1.6/".$entry.".gif.name"));
 ?>
    <tr bgcolor="#ececff">
      <td valign=top>
@@ -48,8 +45,7 @@
 ?>
 
    </table>
-</tr>
-</table>
+</div>
 
 </div>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/externals/en/footer.phtml"); ?>
+<?php include($toppath."/externals/en/footer.phtml"); ?>

Modified: htdocs/trunk/en/search.phtml
===================================================================
--- htdocs/trunk/en/search.phtml	2006-01-19 17:08:03 UTC (rev 12889)
+++ htdocs/trunk/en/search.phtml	2006-01-19 17:08:47 UTC (rev 12890)
@@ -1,21 +1,18 @@
-<?php $title = "Accounting Software for Linux"; ?>
-<?php if (!ini_get('register_globals')) {
- include("../emulate_globals_on.php");
-}
+<?php 
+$title = "Accounting Software for Linux";
+include("../emulate_globals_on.php");
+include($toppath."/externals/en/header.phtml");
+include($toppath."/en/menu/menu-main-search.phtml");
 ?>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/externals/en/header.phtml"); ?>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/en/menu/menu-main-search.phtml"); ?>
-</div>
 <div id="content">
 
 <?php
 
-
-include($GLOBALS['DOCUMENT_ROOT']."/en/components/table_top.phtml");
+include($toppath."/en/components/table_top.phtml");
 print "Search results for <b>$words</b>";
-include($GLOBALS['DOCUMENT_ROOT']."/en/components/table_middle.phtml");
+include($toppath."/en/components/table_middle.phtml");
 
-$HTSEARCH_PROG = "./htdig.sh";
+$HTSEARCH_PROG = "$toppath/htdig.sh";
 # $swords = $words;
 $swords = EscapeShellCmd(UrlEncode($words));
 # $swords = UrlEncode(EscapeShellCmd($words));
@@ -135,8 +132,9 @@
 
 # page_list($page, $matches);
 
-include($GLOBALS['DOCUMENT_ROOT']."/en/components/table_bottom.phtml");
+include($toppath."/en/components/table_bottom.phtml");
 
 ?>
+</div>
 
-<?php include($GLOBALS['DOCUMENT_ROOT']."/externals/en/footer.phtml"); ?>
+<?php include($toppath."/externals/en/footer.phtml"); ?>

Modified: htdocs/trunk/en/sizing.phtml
===================================================================
--- htdocs/trunk/en/sizing.phtml	2006-01-19 17:08:03 UTC (rev 12889)
+++ htdocs/trunk/en/sizing.phtml	2006-01-19 17:08:47 UTC (rev 12890)
@@ -1,10 +1,9 @@
 <?php $title = "Sizing"; ?>
-<?php if (!ini_get('register_globals')) {
- include("../emulate_globals_on.php");
-}
+<?php
+include("../emulate_globals_on.php");
+include($toppath."/externals/en/header.phtml");
+include($toppath."/en/menu/menu-main-other.phtml");
 ?>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/externals/en/header.phtml"); ?>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/en/menu/menu-main-other.phtml"); ?>
 
 <div id="content">
 
@@ -486,4 +485,4 @@
     </DD>
 </DL>
 </div>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/externals/en/footer.phtml"); ?>
+<?php include($toppath."/externals/en/footer.phtml"); ?>

Modified: htdocs/trunk/en/sql.phtml
===================================================================
--- htdocs/trunk/en/sql.phtml	2006-01-19 17:08:03 UTC (rev 12889)
+++ htdocs/trunk/en/sql.phtml	2006-01-19 17:08:47 UTC (rev 12890)
@@ -1,10 +1,9 @@
 <?php $title = "Documentation Project"; ?>
-<?php if (!ini_get('register_globals')) {
- include("../emulate_globals_on.php");
-}
+<?php
+include("../emulate_globals_on.php");
+include($toppath."/externals/en/header.phtml");
+include($toppath."/en/menu/menu-main-documentation.phtml");
 ?>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/externals/en/header.phtml"); ?>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/en/menu/menu-main-documentation.phtml"); ?>
 <div id="content">
 
 <h1>Using GnuCash With the SQL Backend</h1>
@@ -526,5 +525,5 @@
 </pre>
 </div>
 
-<?php include($GLOBALS['DOCUMENT_ROOT']."/externals/en/footer.phtml"); ?>
+<?php include($toppath."/externals/en/footer.phtml"); ?>
 

Modified: htdocs/trunk/en/state_of_the_gnucash_project.phtml
===================================================================
--- htdocs/trunk/en/state_of_the_gnucash_project.phtml	2006-01-19 17:08:03 UTC (rev 12889)
+++ htdocs/trunk/en/state_of_the_gnucash_project.phtml	2006-01-19 17:08:47 UTC (rev 12890)
@@ -1,10 +1,9 @@
 <?php $title = "Roadmap"; ?>
-<?php if (!ini_get('register_globals')) {
- include("../emulate_globals_on.php");
-}
+<?php 
+include("../emulate_globals_on.php");
+include($toppath."/externals/en/header.phtml");
+include($toppath."/en/menu/menu-main-developer.phtml");
 ?>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/externals/en/header.phtml"); ?>
-<?php include($GLOBALS['DOCUMENT_ROOT']."/en/menu/menu-main-developer.phtml"); ?>
 </div>
 <div id="content">
 
@@ -71,4 +70,4 @@
 
 <p><a href="mailto:bock at step.polymtl.ca">Benoit Gr&eacute;goire</a></p>
 
-<?php include($GLOBALS['DOCUMENT_ROOT']."/externals/en/footer.phtml"); ?>
+<?php include($toppath."/externals/en/footer.phtml"); ?>



More information about the gnucash-changes mailing list