r21447 - htdocs/trunk - Merge beta website from revision 21434.

Cristian Marchi cmarchi at code.gnucash.org
Tue Oct 18 09:28:58 EDT 2011


Author: cmarchi
Date: 2011-10-18 09:28:58 -0400 (Tue, 18 Oct 2011)
New Revision: 21447
Trac: http://svn.gnucash.org/trac/changeset/21447

Modified:
   htdocs/trunk/
   htdocs/trunk/atom.php
   htdocs/trunk/download.phtml
   htdocs/trunk/externals/footer.phtml
   htdocs/trunk/externals/header.phtml
   htdocs/trunk/features.phtml
   htdocs/trunk/news/news-script.php
Log:
Merge beta website from revision 21434.


Property changes on: htdocs/trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /htdocs/branches/beta:20835-21348
   + /htdocs/branches/beta:20835-21348,21435-21446

Modified: htdocs/trunk/atom.php
===================================================================
--- htdocs/trunk/atom.php	2011-10-18 13:18:46 UTC (rev 21446)
+++ htdocs/trunk/atom.php	2011-10-18 13:28:58 UTC (rev 21447)
@@ -60,7 +60,7 @@
   <entry>
     <id>urn:x-gnucash:news:<?= urlencode($key) ?></id>
     <title><?= $title ?></title>
-    <link rel="alternate" href="http://www.gnucash.org/#<?=generate_anchor($key);?>" />
+    <link rel="alternate" href="http://www.gnucash.org/#n-<?=generate_anchor($key);?>" />
     <author>
       <name>GnuCash Developers</name>
       <email>gnucash-devel at gnucash.org</email>

Modified: htdocs/trunk/download.phtml
===================================================================
--- htdocs/trunk/download.phtml	2011-10-18 13:18:46 UTC (rev 21446)
+++ htdocs/trunk/download.phtml	2011-10-18 13:28:58 UTC (rev 21447)
@@ -23,7 +23,7 @@
 <li class="imagelistitem" style="background-image: url(<?=$top_dir?>/images/icons/macosx.png);"><?php printf (T_("GnuCash %s for"), $latest_stable)?> Mac OS X <a href="<?php echo $download_path.$latest_stable_mac_intel;?>">Intel</a> | <a href="<?php echo $download_path.$latest_stable_mac_ppc;?>">Power PC</a> | <a href="http://wiki.gnucash.org/wiki/MacOSX/<?php echo $latest_stable;?>/Readme">Readme</a></li>
 </ul>
 
-<a name="distribution"></a><h3>Linux</h3>
+<a id="distribution"></a><h3>Linux</h3>
 <p class="justify"><?php echo T_("Most linux distributions come bundled with a version of <span class=\"gnucash\">GnuCash</span>, though it's not always the most recent version and it may not have been installed by default. Still it is recommended to use the <span class=\"gnucash\">GnuCash</span> version that comes with your distribution.");?></p>
 <p class="justify"><?php echo T_("Below are ways to install <span class=\"gnucash\">GnuCash</span> on some of the more popular distributions:");?></p>
 

Modified: htdocs/trunk/externals/footer.phtml
===================================================================
--- htdocs/trunk/externals/footer.phtml	2011-10-18 13:18:46 UTC (rev 21446)
+++ htdocs/trunk/externals/footer.phtml	2011-10-18 13:28:58 UTC (rev 21447)
@@ -2,7 +2,9 @@
 
 <div id="tail">
 <div id="validator">
-<p><a href="http://validator.w3.org/check?uri=referer"><img src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0 Strict" height="31" width="88" /></a></p>
+<p about="" resource="http://www.w3.org/TR/rdfa-syntax" rel="dc:conformsTo" xmlns:dc="http://purl.org/dc/terms/">
+<a href="http://validator.w3.org/check?uri=referer"><img src="http://www.w3.org/Icons/valid-xhtml-rdfa" alt="Valid XHTML + RDFa" height="31" width="88" /></a>
+</p>
 </div>
 <p><b>Copyright © 2001-2011 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>

Modified: htdocs/trunk/externals/header.phtml
===================================================================
--- htdocs/trunk/externals/header.phtml	2011-10-18 13:18:46 UTC (rev 21446)
+++ htdocs/trunk/externals/header.phtml	2011-10-18 13:28:58 UTC (rev 21447)
@@ -1,5 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd">
 
 <?php
 $titleRSS = T_("Subscribe to RSS feed");
@@ -41,7 +40,7 @@
 
 <title><?= T_($title); ?> | GnuCash</title>
 <!--script for Google+1 button-->
-<script type="text/javascript" src="https://apis.google.com/js/plusone.js"></script>
+<script type="text/javascript" src="https://apis.google.com/js/plusone.js">      {lang:'en', parsetags:'explicit'}   </script>
 </head>
 
 <body>
@@ -60,18 +59,24 @@
 <!--facebook like button-->
 <div style="padding:0 0 5px 0">
 <div id="fb-root"></div>
-<script>(function(d, s, id) {
-  var js, fjs = d.getElementsByTagName(s)[0];
-  if (d.getElementById(id)) {return;}
-  js = d.createElement(s); js.id = id;
-  js.src = "//connect.facebook.net/en_US/all.js#xfbml=1";
-  fjs.parentNode.insertBefore(js, fjs);
-}(document, 'script', 'facebook-jssdk'));</script>
-
-<div class="fb-like" data-href="www.gnucash.org" data-send="false" data-layout="box_count" data-width="60" data-show-faces="true" data-font="verdana"></div>
+    <script type="text/javascript">
+    //<![CDATA[
+    (function() {
+        document.write('<fb:like width="200" data-href="www.gnucash.org" data-send="false" data-layout="box_count" data-width="60" data-show-faces="true" data-font="verdana"></fb:like>');
+        var s = document.createElement('SCRIPT'), s1 = document.getElementsByTagName('SCRIPT')[0];
+        s.type = 'text/javascript';
+        s.async = true;
+        s.src = 'http://connect.facebook.net/en_US/all.js#xfbml=1';
+        s1.parentNode.insertBefore(s, s1);
+    })();
+    //]]>
+    </script>
 </div>
 <!-- google +1 button-->
-<g:plusone size="tall" href="http://www.gnucash.org/"></g:plusone>
+<div id="gplusone" class="plusone"></div>
+                   <script type="text/javascript">
+                              gapi.plusone.render('gplusone', { "size": "tall", "count": "false" });
+                   </script> 
 </div>
 
 <!-- the icons on the top right-->

Modified: htdocs/trunk/features.phtml
===================================================================
--- htdocs/trunk/features.phtml	2011-10-18 13:18:46 UTC (rev 21446)
+++ htdocs/trunk/features.phtml	2011-10-18 13:28:58 UTC (rev 21447)
@@ -21,7 +21,7 @@
 </ul>
 </div>
 
-<h1 class="featuresection"><a name="main-feat"></a><?php echo T_("Main features");?></h1>
+<h1 class="featuresection"><a id="main-feat"></a><?php echo T_("Main features");?></h1>
 
 <div class="featurecontainer">
 <div class="featureborder">
@@ -114,7 +114,7 @@
 </p>
 </div>
 
-<h1 class="featuresection"><a name="advan-feat"></a><?php echo T_("Advanced features");?></h1>
+<h1 class="featuresection"><a id="advan-feat"></a><?php echo T_("Advanced features");?></h1>
 
 <div class="featurecontainer">
 <div class="featureborder">
@@ -157,7 +157,7 @@
 <?php echo T_("Get Stock & Mutual Fund quotes from various web sites, update portfolio automatically. Additional pricing sources are added regularly.");?></p>
 </div>
 
-<h1 class="featuresection"><a name="data-feat"></a><?php echo T_("Data storage and exchange features");?></h1>
+<h1 class="featuresection"><a id="data-feat"></a><?php echo T_("Data storage and exchange features");?></h1>
 
 <div class="featurecontainer">
 <div class="featureborder">
@@ -190,7 +190,7 @@
 </p>
 </div>
 
-<h1 class="featuresection"><a name="oth-feat"></a><?php echo T_("Other goodies");?></h1>
+<h1 class="featuresection"><a id="oth-feat"></a><?php echo T_("Other goodies");?></h1>
 
 <div class="featurecontainer">
 <div class="featureborder">

Modified: htdocs/trunk/news/news-script.php
===================================================================
--- htdocs/trunk/news/news-script.php	2011-10-18 13:18:46 UTC (rev 21446)
+++ htdocs/trunk/news/news-script.php	2011-10-18 13:28:58 UTC (rev 21447)
@@ -132,7 +132,7 @@
   <div class="newsheader" style="display:inline-block;background-color:#CACAF7;width:100%">
     <div style="float:left;">
     <img src="<?=$top_dir?>/images/icons/document.txt.gif" width="16" height="16" alt="[news]" /> 
-    <a style="text-decoration:none;color:black;" onmouseover="this.style.backgroundColor='#cacaf7';" onmouseout="this.style.backgroundColor='#cacaf7';" name="<?=generate_anchor($key)?>"><?= $fa[0]; ?> - <b><?= $newsfile[$key] ?></b></a>
+    <a style="text-decoration:none;color:black;" onmouseover="this.style.backgroundColor='#cacaf7';" onmouseout="this.style.backgroundColor='#cacaf7';" id="n-<?=generate_anchor($key)?>"><?= $fa[0]; ?> - <b><?= $newsfile[$key] ?></b></a>
   </div>
 <!-- the next div could be used to add a date on the right of the news heading-->
     <div style="float:right;">



More information about the gnucash-changes mailing list