[Gnucash-changes] r14404 - htdocs/branches/beta - Merge from trunk revisions 14396:14403

Derek Atkins warlord at cvs.gnucash.org
Wed Jun 21 18:19:48 EDT 2006 

Author: warlord
Date: 2006-06-21 18:19:47 -0400 (Wed, 21 Jun 2006)
New Revision: 14404
Trac: http://svn.gnucash.org/trac/changeset/14404

Added:
   htdocs/branches/beta/externals/feed-icon-12x12.png
   htdocs/branches/beta/externals/feed-icon-32x32.png
Removed:
   htdocs/branches/beta/images/feed-icon-12x12.png
   htdocs/branches/beta/images/feed-icon-32x32.png
   htdocs/branches/beta/search/Makefile
Modified:
   htdocs/branches/beta/README
   htdocs/branches/beta/docs.phtml
   htdocs/branches/beta/externals/footer.phtml
   htdocs/branches/beta/externals/menu.phtml
Log:
Merge from trunk revisions 14396:14403


Modified: htdocs/branches/beta/README
===================================================================
--- htdocs/branches/beta/README	2006-06-21 20:48:12 UTC (rev 14403)
+++ htdocs/branches/beta/README	2006-06-21 22:19:47 UTC (rev 14404)
@@ -8,6 +8,7 @@
   - re-flow existing po-file content.
 - update features screenshots
 - revise docs.phtml
+- fix double-slash on langdir='' mlist search menu URLs
 
 -------------------------------------------------
 Notes about multi-lingual gnucash website content

Modified: htdocs/branches/beta/docs.phtml
===================================================================
--- htdocs/branches/beta/docs.phtml	2006-06-21 20:48:12 UTC (rev 14403)
+++ htdocs/branches/beta/docs.phtml	2006-06-21 22:19:47 UTC (rev 14404)
@@ -17,6 +17,18 @@
 <div class="tblborder">
      <div class="frametitle">
          <img src="<?=$top_dir?>/images/icons/document.txt.gif" width="16" height="16" alt="[document icon]" />
+         <b><?php echo _("GnuCash v1.9 (current unstable)");?></b>
+     </div>
+     <div class="newsinner">
+       <p>A nightly build of the <a href="http://svn.gnucash.org/docs/guide/">current unstable-branch Concepts Guide</a> is available.</p>
+     </div>
+</div>
+
+<br />
+
+<div class="tblborder">
+     <div class="frametitle">
+         <img src="<?=$top_dir?>/images/icons/document.txt.gif" width="16" height="16" alt="[document icon]" />
          <b><?php echo _("GnuCash v1.8 (current stable release)");?></b>
      </div>
      <div class="newsinner">

Copied: htdocs/branches/beta/externals/feed-icon-12x12.png (from rev 14403, htdocs/trunk/externals/feed-icon-12x12.png)

Copied: htdocs/branches/beta/externals/feed-icon-32x32.png (from rev 14403, htdocs/trunk/externals/feed-icon-32x32.png)

Modified: htdocs/branches/beta/externals/footer.phtml
===================================================================
--- htdocs/branches/beta/externals/footer.phtml	2006-06-21 20:48:12 UTC (rev 14403)
+++ htdocs/branches/beta/externals/footer.phtml	2006-06-21 22:19:47 UTC (rev 14404)
@@ -1,6 +1,6 @@
 <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="<?=$home?>/atom.php"><img src="<?=$top_dir?>/images/feed-icon-32x32.png" alt="[atom syndication feed]" width="32" height="32" /></a></p>
+<p id="rss"><a href="<?=$home?>/atom.php"><img src="<?=$top_dir?>/externals/feed-icon-32x32.png" alt="[atom syndication feed]" width="32" height="32" /></a></p>
 <p style="text-align:center;"><b>Copyright &copy; 2001-2006 The GnuCash Project</b></p>
 <p style="text-align:center;"><?= _("Server &amp; email outage reports to: ")?><a href="mailto:gnucash-devel at gnucash.org"><b>gnucash-devel at gnucash.org</b></a></p>
 <p style="text-align:center;"><?= _("Translation problems? Contact: <a href=\"mailto:gnucash-devel at gnucash.org\"><b>gnucash-devel at gnucash.org</b></a>");?></p>

Modified: htdocs/branches/beta/externals/menu.phtml
===================================================================
--- htdocs/branches/beta/externals/menu.phtml	2006-06-21 20:48:12 UTC (rev 14403)
+++ htdocs/branches/beta/externals/menu.phtml	2006-06-21 22:19:47 UTC (rev 14404)
@@ -1,7 +1,7 @@
 <?php
 $self = $_SERVER["HTTP_HOST"];
-if(ereg("lists.gnucash.org",$self)) {
-  $home = "http://www.gnucash.org/";
+if (ereg("lists.gnucash.org", $self)) {
+  $home = "http://www.gnucash.org";
 }
 ?>
 <div id="news">
@@ -12,7 +12,7 @@
   </span>
   <ul>
     <li><a href="<?=$home?>/index.phtml"><?= _("About / News")?></a></li>
-    <li><a href="<?=$home?>/atom.php"><img src="<?=$top_dir?>/images/feed-icon-12x12.png" width="12" height="12" alt="[atom feed]" /> News Feed</a></li>
+    <li><a href="<?=$home?>/atom.php"><img src="<?=$top_dir?>/externals/feed-icon-12x12.png" width="12" height="12" alt="[atom feed]" /> News Feed</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>

Deleted: htdocs/branches/beta/images/feed-icon-12x12.png
===================================================================
(Binary files differ)

Deleted: htdocs/branches/beta/images/feed-icon-32x32.png
===================================================================
(Binary files differ)

Deleted: htdocs/branches/beta/search/Makefile
===================================================================
--- htdocs/branches/beta/search/Makefile	2006-06-21 20:48:12 UTC (rev 14403)
+++ htdocs/branches/beta/search/Makefile	2006-06-21 22:19:47 UTC (rev 14404)
@@ -1,9 +0,0 @@
-.PHONY: nmz-templates
-
-nmz-templates: templates/NMZ.head.php_tmpl
-	( echo '<?php $$locale = "en"; $$home = "http://www.gnucash.org/beta"; $$top_dir = "."; ?>'; cat templates/NMZ.head.php_tmpl ) | php > templates/NMZ.head;
-
-#	for lang in de es fr ja nb pl; do \
-#		( echo "<?php \$$locale = \"$$lang\"; \$$home = \"http://www.gnucash.org/beta\"; \$$top_dir = \".\"; ?>"; \
-#		  cat templates/NMZ.head.php_tmpl) | php > templates/NMZ.head.xlated_$$lang; \
-#	done

More information about the gnucash-changes mailing list