r21434 - htdocs/branches/beta - Copy trunk to beta branch for further testing.

Cristian Marchi cmarchi at code.gnucash.org
Tue Oct 18 06:14:41 EDT 2011 

Author: cmarchi
Date: 2011-10-18 06:14:41 -0400 (Tue, 18 Oct 2011)
New Revision: 21434
Trac: http://svn.gnucash.org/trac/changeset/21434

Added:
   htdocs/branches/beta/externals/logo_w120.png
   htdocs/branches/beta/images/icons/gc-donation.png
   htdocs/branches/beta/images/icons/gc-rss.png
   htdocs/branches/beta/images/icons/gc-uservoice.png
   htdocs/branches/beta/images/icons/gnc-icon-64x64.png
   htdocs/branches/beta/news/111008-OSX-Lion-Update.news
Removed:
   htdocs/branches/beta/images/icons/donation-32x32.png
   htdocs/branches/beta/images/icons/feed-icon-12x12.png
   htdocs/branches/beta/images/icons/feed-icon-32x32.png
   htdocs/branches/beta/images/icons/uservoice-32x32.png
Modified:
   htdocs/branches/beta/
   htdocs/branches/beta/README
   htdocs/branches/beta/externals/global_params.php
   htdocs/branches/beta/externals/gnucash.css
   htdocs/branches/beta/externals/header.phtml
   htdocs/branches/beta/externals/menu.phtml
   htdocs/branches/beta/news/110608-book.news
   htdocs/branches/beta/news/110925-new-website.news
   htdocs/branches/beta/news/it/110501-book.news
   htdocs/branches/beta/news/it/110925-new-website.news
Log:
Copy trunk to beta branch for further testing.


Property changes on: htdocs/branches/beta
___________________________________________________________________
Added: svn:mergeinfo
   + /htdocs/trunk:21350-21433

Modified: htdocs/branches/beta/README
===================================================================
--- htdocs/branches/beta/README	2011-10-18 08:44:36 UTC (rev 21433)
+++ htdocs/branches/beta/README	2011-10-18 10:14:41 UTC (rev 21434)
@@ -70,6 +70,13 @@
 
   $homepage := if the file is the homepage; controls RSS feed linkage.
 
+-------------------
+Note about folders
+-------------------
+- "externals" folder contains images linked to external sources (e.g. logo_w120.png
+  is used on the wiki and packtpub_gnucash_2.4cov.png is linked to the external 
+  book website)
+
 ----------------------
 Preparing translations
 ----------------------

Modified: htdocs/branches/beta/externals/global_params.php
===================================================================
--- htdocs/branches/beta/externals/global_params.php	2011-10-18 08:44:36 UTC (rev 21433)
+++ htdocs/branches/beta/externals/global_params.php	2011-10-18 10:14:41 UTC (rev 21434)
@@ -4,10 +4,10 @@
      // Both a latest stable version and a latest unstable version are defined.
      $latest_stable             = "2.4.7";
      $latest_stable_win         = $latest_stable;
- #    $latest_stable_mac_ppc     = $latest_stable.".1";
-     $latest_stable_mac_ppc     = $latest_stable;
- #    $latest_stable_mac_intel   = $latest_stable.".1";
-     $latest_stable_mac_intel   = $latest_stable;
+     $latest_stable_mac_ppc     = $latest_stable."-2";
+ #    $latest_stable_mac_ppc     = $latest_stable;
+     $latest_stable_mac_intel   = $latest_stable."-2";
+ #    $latest_stable_mac_intel   = $latest_stable;
 
      $latest_unstable           = "2.3.17";
      $latest_unstable_win       = $latest_unstable;

Modified: htdocs/branches/beta/externals/gnucash.css
===================================================================
--- htdocs/branches/beta/externals/gnucash.css	2011-10-18 08:44:36 UTC (rev 21433)
+++ htdocs/branches/beta/externals/gnucash.css	2011-10-18 10:14:41 UTC (rev 21434)
@@ -117,8 +117,15 @@
    background-color: #ffffff;
    padding: 4px;
    color: black;
+   display:inline-block;
 }
 
+.newsinner img
+{
+float:left;
+padding:0px 10px 10px 0px;
+}
+
 a[href], a[href]:visited
 {
    color: rgb(8, 0, 109);
@@ -569,7 +576,7 @@
    position:fixed;
    height:0;
    right:0;
-   top:200px;
+   top:255px;
    z-index:-1;
 }
 
@@ -584,6 +591,7 @@
    padding:5px;
    right:0;
    top:120px;
+   width:55px;
 }
 
 #googleplusone:hover {
@@ -598,3 +606,68 @@
    right:0;
    top:120px;
 }
+
+#navlist{
+   position:relative;
+   width:120px
+}
+
+#navlist li{
+   margin:0;
+   padding:0;
+   list-style:none;
+   position:absolute;
+   top:0;
+}
+#navlist li, #navlist a{
+   height:42px;
+   display:block;
+}
+
+#uservoice-icon{
+   left:0px;
+   width:42px;
+}
+
+#uservoice-icon{
+   background:url('../images/icons/gc-uservoice.png') 0 0;
+   border-radius:12px;
+}
+
+#uservoice-icon a:hover{
+   background: url('../images/icons/gc-uservoice.png') 0 -42px white;
+   border-radius: 16px;
+   box-shadow: 0 0 4px silver;
+}
+
+#donation-icon{
+   left:50px;
+   width:42px;
+}
+
+#donation-icon{
+   background:url('../images/icons/gc-donation.png') 0 0;
+   border-radius:12px;
+}
+
+#donation-icon a:hover{
+   background: url('../images/icons/gc-donation.png') 0 -42px white;
+   border-radius: 16px;
+   box-shadow: 0 0 4px silver;
+}
+
+#rss-icon{
+   left:100px;
+   width:42px;
+}
+
+#rss-icon{
+   background:url('../images/icons/gc-rss.png') 0 0;
+   border-radius:12px;
+}
+
+#rss-icon a:hover{
+   background: url('../images/icons/gc-rss.png') 0 -42px white;
+   border-radius: 16px;
+   box-shadow: 0 0 4px silver;
+}

Modified: htdocs/branches/beta/externals/header.phtml
===================================================================
--- htdocs/branches/beta/externals/header.phtml	2011-10-18 08:44:36 UTC (rev 21433)
+++ htdocs/branches/beta/externals/header.phtml	2011-10-18 10:14:41 UTC (rev 21434)
@@ -14,6 +14,16 @@
 if ($can_utf)
 { ?>
   <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+
+<!--meta properties for facebook Open Graph-->
+<meta property="og:title" content="Free Accounting Software | GnuCash"/>
+<meta property="og:type" content="website"/>
+<meta property="og:url" content="http://www.gnucash.org/"/>
+<meta property="og:image" content="http://www.gnucash.org/images/icons/gnc-icon-64x64.png"/>
+<meta property="og:site_name" content="GnuCash"/>
+<meta property="og:description" content="A personal and small-business financial-accounting software, licensed under GNU/GPL and available for Linux, Windows, Mac OS X, BSD, and Solaris."/>
+<!--end of Open Graph properties-->
+
 <?php } ?>
 <link rel="stylesheet" href="<?=$home?>/externals/gnucash.css" type="text/css" />
 <link rel="icon" href="<?=$home?>/favicon.ico" type="image/x-icon" />
@@ -46,15 +56,31 @@
 <div style="position:absolute;top:-1000px;left:-1000px;"><img src="<?=$home?>/images/gnc-download.png" alt="GnuCash small business accounting" height="152" width="125" /></div>
 
 <div id="googleplusone">
+
+<!--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>
+</div>
+<!-- google +1 button-->
 <g:plusone size="tall" href="http://www.gnucash.org/"></g:plusone>
 </div>
 
+<!-- the icons on the top right-->
 <div style="float:right;">
-<p id="rss">
-<a href="http://gnucash.uservoice.com/"><img style="margin: 0 10px 0 0" src="<?=$top_dir?>/images/icons/uservoice-32x32.png" title="<?php echo T_($titleuservoice);?>" alt="[Uservoice]" width="32" height="32" /></a>
-<a href="http://sourceforge.net/donate/index.php?group_id=192"><img style="margin: 0 10px 0 0" src="<?=$top_dir?>/images/icons/donation-32x32.png" title="<?php echo T_($titledonation);?>" alt="[Donation]" width="32" height="32" /></a>
-<a href="<?=$home?>/atom.php"><img style="margin: 0 10px 0 0" src="<?=$top_dir?>/images/icons/feed-icon-32x32.png" title="<?php echo T_($titleRSS);?>" alt="[atom syndication feed]" width="32" height="32" /></a>
-</p>
+<ul id="navlist">
+  <li id="uservoice-icon"><a href="http://gnucash.uservoice.com/" title="<?php echo T_($titleuservoice);?>"></a></li>
+  <li id="donation-icon"><a href="http://sourceforge.net/donate/index.php?group_id=192" title="<?php echo T_($titledonation);?>"></a></li>
+  <li id="rss-icon"><a href="<?=$home?>/atom.php" title="<?php echo T_($titleRSS);?>"></a></li>
+</ul>
 </div>
 
 <div style="margin: 0px 0px 0 0;">

Copied: htdocs/branches/beta/externals/logo_w120.png (from rev 21433, htdocs/trunk/externals/logo_w120.png)
===================================================================
(Binary files differ)

Modified: htdocs/branches/beta/externals/menu.phtml
===================================================================
--- htdocs/branches/beta/externals/menu.phtml	2011-10-18 08:44:36 UTC (rev 21433)
+++ htdocs/branches/beta/externals/menu.phtml	2011-10-18 10:14:41 UTC (rev 21434)
@@ -43,7 +43,7 @@
 <div class="othernews">
   <!-- ?php include("$top_dir/externals/menu-developer.phtml");? -->
   <span class="linktop">
-    <b><?=T_("Developement")?></b>
+    <b><?=T_("Development")?></b>
   </span>
   <ul>
     <li><a href="http://svn.gnucash.org/docs/HEAD/"><?=T_("Source Docs")?></a></li>

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

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

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

Copied: htdocs/branches/beta/images/icons/gc-donation.png (from rev 21433, htdocs/trunk/images/icons/gc-donation.png)
===================================================================
(Binary files differ)

Copied: htdocs/branches/beta/images/icons/gc-rss.png (from rev 21433, htdocs/trunk/images/icons/gc-rss.png)
===================================================================
(Binary files differ)

Copied: htdocs/branches/beta/images/icons/gc-uservoice.png (from rev 21433, htdocs/trunk/images/icons/gc-uservoice.png)
===================================================================
(Binary files differ)

Copied: htdocs/branches/beta/images/icons/gnc-icon-64x64.png (from rev 21433, htdocs/trunk/images/icons/gnc-icon-64x64.png)
===================================================================
(Binary files differ)

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

Modified: htdocs/branches/beta/news/110608-book.news
===================================================================
--- htdocs/branches/beta/news/110608-book.news	2011-10-18 08:44:36 UTC (rev 21433)
+++ htdocs/branches/beta/news/110608-book.news	2011-10-18 10:14:41 UTC (rev 21434)
@@ -4,7 +4,7 @@
 <h2>Recommended New Book: GnuCash 2.4 Small Business Accounting</h2>
 
 <p>
-<a href="http://link.packtpub.com/6FDDUr"><img style="float:left" alt="book-cover"
+<a href="http://link.packtpub.com/6FDDUr"><img alt="book-cover"
 src="/externals/packtpub_gnucash_2.4cov.png" width="125" height="152" /></a>
 The GnuCash development team received notice about a new book
 published by PacktPub, UK: <a

Modified: htdocs/branches/beta/news/110925-new-website.news
===================================================================
--- htdocs/branches/beta/news/110925-new-website.news	2011-10-18 08:44:36 UTC (rev 21433)
+++ htdocs/branches/beta/news/110925-new-website.news	2011-10-18 10:14:41 UTC (rev 21434)
@@ -7,7 +7,7 @@
 <p>The <a href="http://www.gnucash.org/features.phtml">features page</a> got some attention and now it better showcases what GnuCash is able to offer to its users. In addition to the features page, the content was updated also for the <a href="http://www.gnucash.org/docs.phtml">download</a> and <a href="http://www.gnucash.org/docs.phtml">documentation</a> pages. In this last page, you can now download the GnuCash docs in the <em>epub</em> format (e-book file format), thanks to the work provided by SASAKI Suguru.</p>
 <p>The GnuCash team hopes that you will enjoy the new look and contents of the refreshed website.</p>
 
-<p>For any problem concerning the new website or to help translating it in your language, feel free to contact the <a href="gnucash-devel at gnucash.org">GnuCash devel mailing list</a>.
+<p>For any problem concerning the new website or to help translating it in your language, feel free to contact the <a href="gnucash-devel at gnucash.org">GnuCash devel mailing list</a></p>.
 
 <h3>About the Program</h3>
 <p>GnuCash is a free, open source accounting program released under the GNU General Public License (GPL) and available for GNU/Linux, *BSD, Solaris, Mac OSX and Microsoft Windows.  Programming on GnuCash began in 1997, and its first stable release was in 1998.</p>

Copied: htdocs/branches/beta/news/111008-OSX-Lion-Update.news (from rev 21433, htdocs/trunk/news/111008-OSX-Lion-Update.news)
===================================================================
--- htdocs/branches/beta/news/111008-OSX-Lion-Update.news	                        (rev 0)
+++ htdocs/branches/beta/news/111008-OSX-Lion-Update.news	2011-10-18 10:14:41 UTC (rev 21434)
@@ -0,0 +1,11 @@
+<b>Announcement:</b> Gnucash OSX DMGs Updated for Lion
+2011-10-08
+
+<h2>Gnucash MacOS X Packages Updated for Lion Compatibility</h2>
+
+<p>New downloadable disk images (DMGs) are available for Mac users of Gnucash; follow the link at the top of the page or the <a href="http://www.gnucash.org/download.phtml">Downloads page</a> to get them.</p>
+
+<p>No changes to Gnucash itself are in the new images; rather, a new build of Gtk+ provides compatibility with OS X Versions 10.5 (Leopard), 10.6 (Snow Leopard), and 10.7 (Lion), as well as several bugfixes and stability improvements. We recommend this update for all OS X users, not just those using Lion.</p>
+
+<h3>About the Program</h3>
+<p>GnuCash is a free, open source accounting program released under the GNU General Public License (GPL) and available for GNU/Linux, *BSD, Solaris, Mac OSX and Microsoft Windows.  Programming on GnuCash began in 1997, and its first stable release was in 1998.</p>

Modified: htdocs/branches/beta/news/it/110501-book.news
===================================================================
--- htdocs/branches/beta/news/it/110501-book.news	2011-10-18 08:44:36 UTC (rev 21433)
+++ htdocs/branches/beta/news/it/110501-book.news	2011-10-18 10:14:41 UTC (rev 21434)
@@ -5,7 +5,7 @@
 (contabilità per le piccole imprese con GnuCash 2.4; testo in inglese)</h2>
 
 <p>
-<a href="http://link.packtpub.com/6FDDUr"><img style="float:left" alt="book-cover"
+<a href="http://link.packtpub.com/6FDDUr"><img alt="book-cover"
 src="/externals/packtpub_gnucash_2.4cov.png" width="125" height="152" /></a>
 Il gruppo di sviluppo di GnuCash ha ricevuto una notifica riguardante la pubblicazione
 di un nuovo libro pubblicato da PacktPub (Regno Unito): <a

Modified: htdocs/branches/beta/news/it/110925-new-website.news
===================================================================
--- htdocs/branches/beta/news/it/110925-new-website.news	2011-10-18 08:44:36 UTC (rev 21433)
+++ htdocs/branches/beta/news/it/110925-new-website.news	2011-10-18 10:14:41 UTC (rev 21434)
@@ -7,7 +7,7 @@
 <p>La <a href="http://www.gnucash.org/features.phtml">pagina delle caratteristiche</a> è stata migliorata e ora descrive in modo più approfondito e aggiornato quello che GnuCash è in grado di fornire ai suoi utenti. Oltre alla pagina delle caratteristiche, il contenuto è stato aggiornato anche per le pagine di <a href="http://www.gnucash.org/docs.phtml">download</a> e della <a href="http://www.gnucash.org/docs.phtml">documentazione</a>. In quest'ultima è ora possibile scaricare la documentazione di GnuCash in formato <em>epub</em> (formato file per e-book), grazie al lavoro svolto da SASAKI Suguru.</p>
 <p>Il gruppo di sviluppo di GnuCash si augura che le modifiche apportate siano di vostro gradimento.</p>
 
-<p>Per qualsiasi problema relativo alo sito web o per contribuire alla sua traduzione, contattare la <a href="gnucash-devel at gnucash.org">lista di discussione degli sviluppatori di GnuCash</a>.
+<p>Per qualsiasi problema relativo al sito web o per contribuire alla sua traduzione, contattare la <a href="gnucash-devel at gnucash.org">lista di discussione degli sviluppatori di GnuCash</a>.</p>
 
 <h3>Informazioni sul programma</h3>
 <p>GnuCash è un programma di contabilità gratuito e a codice aperto rilasciato nel rispetto dei termini della licenza GNU General Public License (GPL) e disponibile per GNU/Linux, *BSD, Solaris, Mac OSX e Microsoft Windows. La scrittura del programma GnuCash ha avuto inizio nel 1997 e la prima versione stabile risale al 1998.</p>

More information about the gnucash-changes mailing list