buildbot success in ASF Buildbot on aoo-win7

2014-04-14 Thread buildbot
Hi! , The aoo-win7 builder has just completed a run

STATUS: Success

 Build revision 1586681 on branch openoffice/trunk

 Snapshot results at: http://ci.apache.org/projects/openoffice/

 Build using the ASF buildslave: bb-win7

 Build results at: http://ci.apache.org/builders/aoo-win7/builds/1001

 Build reason was: The Nightly scheduler named 'aoo-win7-nightly' triggered 
this build


 Yours Sincerely - The ASF Buildbot (http://ci.apache.org/)
--

 Join the bui...@apache.org mailing list for help with Buildbot






buildbot success in ASF Buildbot on openoffice-linux32-nightly

2014-04-14 Thread buildbot
Hi! , The openoffice-linux32-nightly builder has just completed a run

STATUS: Success

 Build revision 1587128 on branch openoffice/trunk

 Snapshot results at: http://ci.apache.org/projects/openoffice/

 Build using the ASF buildslave: bb-vm2_ubuntu_32bit

 Build results at: 
http://ci.apache.org/builders/openoffice-linux32-nightly/builds/708

 Build reason was: The Nightly scheduler named 'openoffice-linux32-nightly' 
triggered this build


 Yours Sincerely - The ASF Buildbot (http://ci.apache.org/)
--

 Join the bui...@apache.org mailing list for help with Buildbot






buildbot success in ASF Buildbot on openoffice-linux64-nightly

2014-04-14 Thread buildbot
Hi! , The openoffice-linux64-nightly builder has just completed a run

STATUS: Success

 Build revision 1587137 on branch openoffice/trunk

 Snapshot results at: http://ci.apache.org/projects/openoffice/

 Build using the ASF buildslave: tethys_ubuntu

 Build results at: 
http://ci.apache.org/builders/openoffice-linux64-nightly/builds/949

 Build reason was: The Nightly scheduler named 'openoffice-linux64-nightly' 
triggered this build


 Yours Sincerely - The ASF Buildbot (http://ci.apache.org/)
--

 Join the bui...@apache.org mailing list for help with Buildbot






svn commit: r906128 - in /websites/production/ooo-site: cgi-bin/ content/

2014-04-14 Thread robweir
Author: robweir
Date: Mon Apr 14 13:11:26 2014
New Revision: 906128

Log:
Publishing svnmucc operation to ooo-site site by robweir

Added:
websites/production/ooo-site/cgi-bin/
  - copied from r906127, websites/staging/ooo-site/trunk/cgi-bin/
websites/production/ooo-site/content/
  - copied from r906127, websites/staging/ooo-site/trunk/content/



svn commit: r1587203 - /openoffice/ooo-site/trunk/content/test-he/index.html

2014-04-14 Thread robweir
Author: robweir
Date: Mon Apr 14 13:13:41 2014
New Revision: 1587203

URL: http://svn.apache.org/r1587203
Log: (empty)

Modified:
openoffice/ooo-site/trunk/content/test-he/index.html

Modified: openoffice/ooo-site/trunk/content/test-he/index.html
URL: 
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/test-he/index.html?rev=1587203r1=1587202r2=1587203view=diff
==
--- openoffice/ooo-site/trunk/content/test-he/index.html (original)
+++ openoffice/ooo-site/trunk/content/test-he/index.html Mon Apr 14 13:13:41 
2014
@@ -1,206 +1,204 @@
-!DOCTYPE html PUBLIC -//W3C//DTD XHTML 1.0 Strict//EN 
http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd;
-html xmlns=http://www.w3.org/1999/xhtml; /
-head
-meta name=description content=The official home page of the Apache 
OpenOffice open source project, home of OpenOffice Writer, Calc, Impress, Draw 
and Base. /
-meta name=keywords content=OpenOffice, Open Office, Apache OpenOffice, 
Apache Open Office, OpenOffice.org, Calc, Impress, Draw, Base, ODF, Open 
Document Format, free office editors /
-meta name=google-site-verification 
content=x1jl2cGum4kCvj0PgxjTy_pasCsLY_fBT7my88fpKD4 /
-meta name=p:domain_verify content=bd1ba1fb9d25b0eb3d64891f89e9195e / 
-meta http-equiv=Content-Type content=text/html; charset=utf-8 /
-link href=https://plus.google.com/+openoffice; rel=publisher /
-titleApache OpenOffice - The Free and Open Productivity Suite/title
-style type=text/css
-/* ![CDATA[ */
-/* Exceptions on standard css ---*/
-@import url(/home.css);
-@import url(/styles.css);
-@import url(/exceptions.css);
-/* ]] */
-/style
-
-script
-  function follow(platform) {
-_gaq.push(['_trackEvent','social', 'followUs', platform]); 
-  if (platform == 'Facebook') {
-window.open(https://www.facebook.com/ApacheOO,_blank;);
-  } else if (platform == 'Twitter') {
-window.open(https://twitter.com/ApacheOO,_blank;);
-  } else if (platform == 'GooglePlus') {
-window.open(https://plus.google.com/+openoffice,_blank;);
-  }  else if (platform == 'ApacheBlog') {
-window.open(https://blogs.apache.org/OOo/,_blank;);
-  }
-  }
-/script
-/head
-
-body
-
-div id=actionstatements
-  ul
-li
-  div class=action-info
-div class=action-text action-link
-  h2a href=/test-he/why/I want to learn more about 
OpenOffice/a/h2
-  pa href=/test-he/why/What is Apache OpenOffice? And why should 
I use it?/a/p
-/div
-  /div
-/li
-li
-  hr /
-/li
-li
-  div class=action-download
-div class=action-text action-link
-  h2a href=/test-he/download/I want to download 
OpenOffice/a/h2
-  pa href=/test-he/download/Download Apache OpenOffice for free, 
or find out about other ways of getting it./a/p
-/div
-  /div
-/li
-li
-  hr /
-/li
-li
-  div class=action-help
-div class=action-text action-link
-  h2a href=/test-he/support/I need help with my 
OpenOffice/a/h2
-  pa href=/test-he/support/Help is at hand whenever you need 
it./a/p
-/div
-  /div
-/li
-li
-  hr /
-/li
-li
-  div class=action-extend
-div class=action-text action-link
-  h2a href=/extensions/I want to do more with my 
OpenOffice/a/h2
-  pa href=/extensions/Extend Apache OpenOffice with additional 
functionality, templates and clipart./a/p
-/div
-  /div
-/li
-li
-  hr /
-/li
-li
-  div class=action-participate
-div class=action-text action-link
-   h2a href=/test-he/participate/I want to 
participate in OpenOffice/a/h2
-  pa href=/test-he/participate/
-  Apache OpenOffice is made with help from people all over the world. 
Feel free to contribute!/a/p
-/div
-  /div
-/li
-li
-  hr /
-/li
-li
- div class=action-social
-div class=action-text action-link
-  h2a href=/test-he/social/ 
onclick=javascript:follow('SocialLink');I want to stay in touch with 
OpenOffice/a/h2
-  pa href=/test-he/social/ 
onclick=javascript:follow('SocialLink');
-  Follow the progress of OpenOffice via our announcement list, social 
media areas and blog./a/p
-div class=action-social-extra
-  p
-span style=padding:0 5px;cursor: pointer; cursor: hand; 
onclick=javascript:follow('ApacheBlog');
-title=Official Blogimg src=/images/logo-rss-16.png 
alt=Official Blog /
-auOfficial Blog/u/a/span
-span style=padding:0 5px;cursor: pointer; cursor: hand; 
onclick=javascript:follow('Facebook');
-title=Follow Us on Facebookimg 

svn commit: r906129 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/test-he/index.html

2014-04-14 Thread buildbot
Author: buildbot
Date: Mon Apr 14 13:14:16 2014
New Revision: 906129

Log:
Staging update by buildbot for ooo-site

Modified:
websites/staging/ooo-site/trunk/cgi-bin/   (props changed)
websites/staging/ooo-site/trunk/content/   (props changed)
websites/staging/ooo-site/trunk/content/test-he/index.html

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
--
--- cms:source-revision (original)
+++ cms:source-revision Mon Apr 14 13:14:16 2014
@@ -1 +1 @@
-1587202
+1587203

Propchange: websites/staging/ooo-site/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Mon Apr 14 13:14:16 2014
@@ -1 +1 @@
-1587202
+1587203

Modified: websites/staging/ooo-site/trunk/content/test-he/index.html
==
--- websites/staging/ooo-site/trunk/content/test-he/index.html (original)
+++ websites/staging/ooo-site/trunk/content/test-he/index.html Mon Apr 14 
13:14:16 2014
@@ -2,37 +2,42 @@
 html
 head
 link href=/css/ooo.css rel=stylesheet type=text/css
-
-meta name=description content=The official home page of the Apache 
OpenOffice open source project, home of OpenOffice Writer, Calc, Impress, Draw 
and Base. /
-meta name=keywords content=OpenOffice, Open Office, Apache OpenOffice, 
Apache Open Office, OpenOffice.org, Calc, Impress, Draw, Base, ODF, Open 
Document Format, free office editors /
-meta name=google-site-verification 
content=x1jl2cGum4kCvj0PgxjTy_pasCsLY_fBT7my88fpKD4 /
-meta name=p:domain_verify content=bd1ba1fb9d25b0eb3d64891f89e9195e / 
-meta http-equiv=Content-Type content=text/html; charset=utf-8 /
-link href=https://plus.google.com/+openoffice; rel=publisher /
-titleApache OpenOffice - The Free and Open Productivity Suite/title
-style type=text/css
-/* ![CDATA[ */
-/* Exceptions on standard css ---*/
-@import url(/home.css);
-@import url(/styles.css);
-@import url(/exceptions.css);
-/* ]] */
-/style
-
-script
-  function follow(platform) {
-_gaq.push(['_trackEvent','social', 'followUs', platform]); 
-  if (platform == 'Facebook') {
-window.open(https://www.facebook.com/ApacheOO,_blank;);
-  } else if (platform == 'Twitter') {
-window.open(https://twitter.com/ApacheOO,_blank;);
-  } else if (platform == 'GooglePlus') {
-window.open(https://plus.google.com/+openoffice,_blank;);
-  }  else if (platform == 'ApacheBlog') {
-window.open(https://blogs.apache.org/OOo/,_blank;);
-  }
-  }
-/script
+
+meta name=description content=The official home page of the Apache 
OpenOffice open source project, home of OpenOffice Writer, Calc, Impress, Draw 
and Base. /
+meta name=keywords content=OpenOffice, Open Office, Apache OpenOffice, 
Apache Open Office, OpenOffice.org, Calc, Impress, Draw, Base, ODF, Open 
Document Format, free office editors /
+meta name=google-site-verification 
content=x1jl2cGum4kCvj0PgxjTy_pasCsLY_fBT7my88fpKD4 /
+meta name=p:domain_verify content=bd1ba1fb9d25b0eb3d64891f89e9195e / 
+meta http-equiv=Content-Type content=text/html; charset=utf-8 /
+link href=https://plus.google.com/+openoffice; rel=publisher /
+titleApache OpenOffice - The Free and Open Productivity Suite/title
+style type=text/css
+/* ![CDATA[ */
+/* Exceptions on standard css ---*/
+@import url(/home.css);
+@import url(/styles.css);
+@import url(/exceptions.css);
+@import url(./rtl.css);
+
+/* @import url(/home.css); */
+/* @import url(/styles.css); */
+/* @import url(/exceptions.css); */
+/* ]] */
+/style
+
+script
+  function follow(platform) {
+_gaq.push(['_trackEvent','social', 'followUs', platform]); 
+  if (platform == 'Facebook') {
+window.open(https://www.facebook.com/ApacheOO,_blank;);
+  } else if (platform == 'Twitter') {
+window.open(https://twitter.com/ApacheOO,_blank;);
+  } else if (platform == 'GooglePlus') {
+window.open(https://plus.google.com/+openoffice,_blank;);
+  }  else if (platform == 'ApacheBlog') {
+window.open(https://blogs.apache.org/OOo/,_blank;);
+  }
+  }
+/script
 
 !--#include virtual=/google-analytics.js -- 
 !--#include virtual=/scripts/entourage.js --
@@ -49,175 +54,168 @@
   div id=content
 
 
-
-
-div id=actionstatements
-  ul
-li
-  div class=action-info
-div class=action-text action-link
-  h2a href=/test-he/why/I want to learn more about 
OpenOffice/a/h2
-  pa href=/test-he/why/What is Apache OpenOffice? And why should 
I use it?/a/p
-/div
-  /div

svn commit: r906130 - in /websites/production/ooo-site: cgi-bin/ content/

2014-04-14 Thread robweir
Author: robweir
Date: Mon Apr 14 13:15:36 2014
New Revision: 906130

Log:
Publishing svnmucc operation to ooo-site site by robweir

Added:
websites/production/ooo-site/cgi-bin/
  - copied from r906129, websites/staging/ooo-site/trunk/cgi-bin/
websites/production/ooo-site/content/
  - copied from r906129, websites/staging/ooo-site/trunk/content/



buildbot success in ASF Buildbot on aoo-w7snap

2014-04-14 Thread buildbot
Hi! , The aoo-w7snap builder has just completed a run

STATUS: Success

 Build revision 1585021 on branch openoffice/tags/SNAPSHOT

 Snapshot results at: http://ci.apache.org/projects/openoffice/

 Build using the ASF buildslave: bb-win7

 Build results at: http://ci.apache.org/builders/aoo-w7snap/builds/125

 Build reason was: The Nightly scheduler named 'aoo-win7-snapshot' triggered 
this build


 Yours Sincerely - The ASF Buildbot (http://ci.apache.org/)
--

 Join the bui...@apache.org mailing list for help with Buildbot






svn commit: r1587228 - /openoffice/branches/AOO410/main/solenv/bin/modules/installer/windows/msiglobal.pm

2014-04-14 Thread af
Author: af
Date: Mon Apr 14 15:52:29 2014
New Revision: 1587228

URL: http://svn.apache.org/r1587228
Log:
i124682: Use the right upgrade code for language sets.

Modified:

openoffice/branches/AOO410/main/solenv/bin/modules/installer/windows/msiglobal.pm

Modified: 
openoffice/branches/AOO410/main/solenv/bin/modules/installer/windows/msiglobal.pm
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/solenv/bin/modules/installer/windows/msiglobal.pm?rev=1587228r1=1587227r2=1587228view=diff
==
--- 
openoffice/branches/AOO410/main/solenv/bin/modules/installer/windows/msiglobal.pm
 (original)
+++ 
openoffice/branches/AOO410/main/solenv/bin/modules/installer/windows/msiglobal.pm
 Mon Apr 14 15:52:29 2014
@@ -1582,7 +1582,7 @@ sub get_source_codes ($)
 =cut
 sub set_global_code_variables ($$)
 {
-   my ($languagesref, $allvariableshashref) = @_;
+my ($languagesref, $allvariableshashref) = @_;
 
 my ($source_product_code, $source_upgrade_code) = 
get_source_codes($languagesref);
 my ($target_product_code, $target_upgrade_code) = (undef, undef);
@@ -1630,15 +1630,36 @@ sub set_global_code_variables ($$)
 $target_upgrade_code = { . create_guid() . };
 $installer::logger::Lang-printf(there is no source version = 
created new guids\n);
 }
-
-$target_upgrade_code = {7C35B9AB-2CE3-4C18-BE7C-5B97EA089EB3};
+
+# Keep the upgrade code constant between versions.  Read it from the 
codes.txt file.
+# Note that this handles regular installation sets and language packs.
+my $onelanguage = ${$languagesref}[0];
+$installer::logger::Lang-printf(reading upgrade code for language %s 
from %s\n,
+$onelanguage,
+$installer::globals::codefilename);
+if (defined $installer::globals::codefilename)
+{
+my $code_filename = $installer::globals::codefilename;
+installer::files::check_file($code_filename);
+my $codefile = installer::files::read_file($code_filename);
+my $searchstring = UPGRADECODE;
+my $codeblock = 
installer::windows::idtglobal::get_language_block_from_language_file(
+$searchstring,
+$codefile);
+$target_upgrade_code = 
installer::windows::idtglobal::get_language_string_from_language_block(
+$codeblock,
+$onelanguage,
+);
+}
+# else use the previously generated upgrade code.
+
 $installer::globals::productcode = $target_product_code;
 $installer::globals::upgradecode = $target_upgrade_code;
 $allvariableshashref-{'PRODUCTCODE'} = $target_product_code;
-   $allvariableshashref-{'UPGRADECODE'} = $target_upgrade_code;
+$allvariableshashref-{'UPGRADECODE'} = $target_upgrade_code;
 
-   $installer::logger::Lang-printf(target product code is %s\n, 
$target_product_code);
-   $installer::logger::Lang-printf(target upgrade code is %s\n, 
$target_upgrade_code);
+$installer::logger::Lang-printf(target product code is %s\n, 
$target_product_code);
+$installer::logger::Lang-printf(target upgrade code is %s\n, 
$target_upgrade_code);
 }
 
 




svn commit: r1587333 - /openoffice/ooo-site/trunk/content/why/index.mdtext

2014-04-14 Thread kschenk
Author: kschenk
Date: Mon Apr 14 21:41:48 2014
New Revision: 1587333

URL: http://svn.apache.org/r1587333
Log:
Some updates to WHY

Modified:
openoffice/ooo-site/trunk/content/why/index.mdtext

Modified: openoffice/ooo-site/trunk/content/why/index.mdtext
URL: 
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/why/index.mdtext?rev=1587333r1=1587332r2=1587333view=diff
==
--- openoffice/ooo-site/trunk/content/why/index.mdtext (original)
+++ openoffice/ooo-site/trunk/content/why/index.mdtext Mon Apr 14 21:41:48 2014
@@ -32,7 +32,7 @@ Apache OpenOffice is the leading **open-
 
   - [and it's free](why_free.html)
  
-Best of all, Apache OpenOffice can be downloaded and used entirely free of 
any license fees. Apache OpenOffice is released under the Apache 2.0 License. 
This means you may use it for any purpose - domestic, commercial, educational, 
public administration. You may install it on as many computers as you like. You 
may make copies and give them away to family, friends, students, employees - 
anyone you like.
+Best of all, Apache OpenOffice can be downloaded and used entirely 
**free** of any license fees. Like all Apache Software Foundation software, 
Apache OpenOffice is [free to use](http://www.apache.org/free/). Apache 
OpenOffice is released under the [Apache 2.0 
License](http://www.apache.org/licenses/LICENSE-2.0.html). This means you may 
use it for any purpose - domestic, commercial, educational, public 
administration. You may install it on as many computers as you like. You may 
make copies and give them away to family, friends, students, employees - anyone 
you like.
 
 ## Where is Apache OpenOffice currently used?
 




svn commit: r906194 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/why/index.html

2014-04-14 Thread buildbot
Author: buildbot
Date: Mon Apr 14 21:43:06 2014
New Revision: 906194

Log:
Staging update by buildbot for ooo-site

Modified:
websites/staging/ooo-site/trunk/cgi-bin/   (props changed)
websites/staging/ooo-site/trunk/content/   (props changed)
websites/staging/ooo-site/trunk/content/why/index.html

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
--
--- cms:source-revision (original)
+++ cms:source-revision Mon Apr 14 21:43:06 2014
@@ -1 +1 @@
-1587203
+1587333

Propchange: websites/staging/ooo-site/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Mon Apr 14 21:43:06 2014
@@ -1 +1 @@
-1587203
+1587333

Modified: websites/staging/ooo-site/trunk/content/why/index.html
==
--- websites/staging/ooo-site/trunk/content/why/index.html (original)
+++ websites/staging/ooo-site/trunk/content/why/index.html Mon Apr 14 21:43:06 
2014
@@ -36,7 +36,7 @@
 /li
 li
 pa href=why_free.htmland it's free/a/p
-pBest of all, Apache OpenOffice can be downloaded and used entirely free of 
any license fees. Apache OpenOffice is released under the Apache 2.0 License. 
This means you may use it for any purpose - domestic, commercial, educational, 
public administration. You may install it on as many computers as you like. You 
may make copies and give them away to family, friends, students, employees - 
anyone you like./p
+pBest of all, Apache OpenOffice can be downloaded and used entirely 
strongfree/strong of any license fees. Like all Apache Software Foundation 
software, Apache OpenOffice is a href=http://www.apache.org/free/;free to 
use/a. Apache OpenOffice is released under the a 
href=http://www.apache.org/licenses/LICENSE-2.0.html;Apache 2.0 License/a. 
This means you may use it for any purpose - domestic, commercial, educational, 
public administration. You may install it on as many computers as you like. You 
may make copies and give them away to family, friends, students, employees - 
anyone you like./p
 /li
 /ul
 h2 id=where-is-apache-openoffice-currently-usedWhere is Apache OpenOffice 
currently used?/h2




svn commit: r906196 - in /websites/production/ooo-site: cgi-bin/ content/

2014-04-14 Thread kschenk
Author: kschenk
Date: Mon Apr 14 21:44:52 2014
New Revision: 906196

Log:
Publishing svnmucc operation to ooo-site site by kschenk

Added:
websites/production/ooo-site/cgi-bin/
  - copied from r906194, websites/staging/ooo-site/trunk/cgi-bin/
websites/production/ooo-site/content/
  - copied from r906194, websites/staging/ooo-site/trunk/content/



svn commit: r906198 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/test/index.html

2014-04-14 Thread buildbot
Author: buildbot
Date: Mon Apr 14 22:09:29 2014
New Revision: 906198

Log:
Staging update by buildbot for ooo-site

Modified:
websites/staging/ooo-site/trunk/cgi-bin/   (props changed)
websites/staging/ooo-site/trunk/content/   (props changed)
websites/staging/ooo-site/trunk/content/test/index.html

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
--
--- cms:source-revision (original)
+++ cms:source-revision Mon Apr 14 22:09:29 2014
@@ -1 +1 @@
-1587333
+1587344

Propchange: websites/staging/ooo-site/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Mon Apr 14 22:09:29 2014
@@ -1 +1 @@
-1587333
+1587344

Modified: websites/staging/ooo-site/trunk/content/test/index.html
==
--- websites/staging/ooo-site/trunk/content/test/index.html (original)
+++ websites/staging/ooo-site/trunk/content/test/index.html Mon Apr 14 22:09:29 
2014
@@ -6,35 +6,35 @@
 meta name=description content=The official home page of the Apache 
OpenOffice open source project, home of OpenOffice Writer, Calc, Impress, Draw 
and Base. /
 meta name=keywords content=OpenOffice, Open Office, Apache OpenOffice, 
Apache Open Office, OpenOffice.org, Calc, Impress, Draw, Base, ODF, Open 
Document Format, free office editors /
 meta name=google-site-verification 
content=x1jl2cGum4kCvj0PgxjTy_pasCsLY_fBT7my88fpKD4 /
-   meta name=p:domain_verify 
content=bd1ba1fb9d25b0eb3d64891f89e9195e/
+meta name=p:domain_verify content=bd1ba1fb9d25b0eb3d64891f89e9195e / 
 meta http-equiv=Content-Type content=text/html; charset=utf-8 /
 link href=https://plus.google.com/+openoffice; rel=publisher /
 titleApache OpenOffice - The Free and Open Productivity Suite/title
+script type=text/javascript src=download/globalvars.js/script
 style type=text/css
 /* ![CDATA[ */
 /* Exceptions on standard css ---*/
-@import ../home.css;
-@import ../styles.css;
-@import ../exceptions.css;
+@import home.css;
+@import styles.css;
+@import exceptions.css;
 /* ]] */
 /style
 
 script
-   function follow(platform) {
-   _gaq.push(['_trackEvent','social', 'followUs', platform]);
-   if (platform == 'Facebook') {
-   
window.open(https://www.facebook.com/ApacheOO,_blank;);
-   } else if (platform == 'Twitter') {
-   window.open(https://twitter.com/ApacheOO,_blank;);
-   } else if (platform == 'GooglePlus') {
-   
window.open(https://plus.google.com/+openoffice,_blank;);
-   }  else if (platform == 'ApacheBlog') {
-   window.open(https://blogs.apache.org/OOo/,_blank;);
-   }
-   }
+  function follow(platform) {
+_gaq.push(['_trackEvent','social', 'followUs', platform]); 
+  if (platform == 'Facebook') {
+window.open(https://www.facebook.com/ApacheOO,_blank;);
+  } else if (platform == 'Twitter') {
+window.open(https://twitter.com/ApacheOO,_blank;);
+  } else if (platform == 'GooglePlus') {
+window.open(https://plus.google.com/+openoffice,_blank;);
+  }  else if (platform == 'ApacheBlog') {
+window.open(https://blogs.apache.org/OOo/,_blank;);
+  }
+  }
 /script
 
-
 !--#include virtual=/google-analytics.js -- 
 !--#include virtual=/scripts/entourage.js --
 /head
@@ -52,38 +52,47 @@
 
 
 
+!-- The text in the H1 tag is intentionally shown as not displayable, just to 
please accessibility tools like a
+screen reader.
+--
+h1 style=display: none;Apache OpenOffice/h1
+
 div id=actionstatements
   ul
 li
   div class=action-info
 div class=action-text action-link
-  h2a href=/why/I want to learn more about OpenOffice/a/h2
-
-  pa href=/why/What is Apache OpenOffice? And why should I use 
it?/a/p
+  a href=../why/index.htmlh2I want to learn more about 
OpenOffice/h2
+  pWhat is Apache OpenOffice? Why should I use it? Is it 
emreally/em free?/p/a
 /div
   /div
 /li
 li
   hr /
 /li
-li
-  div class=action-download
-div class=action-text action-link
-  h2a href=/download/I want to download OpenOffice/a/h2
 
-  pa href=/download/Download Apache OpenOffice for free, or find 
out about other ways of getting it./a/p
-/div
-  /div
-/li
+!-- Show the currently available version, load via JavaScript --
+script type=text/javascript
+!--
+document.write( li
+  + div class='action-download'
++ div class='action-text action-link'
+  + a href='download/index.html'h2I want to download Apache 

svn commit: r1587346 - in /openoffice/ooo-site/trunk/content/test: exceptions.css home.css styles.css

2014-04-14 Thread kschenk
Author: kschenk
Date: Mon Apr 14 22:13:52 2014
New Revision: 1587346

URL: http://svn.apache.org/r1587346
Log:
Update styles in test area.


Modified:
openoffice/ooo-site/trunk/content/test/exceptions.css
openoffice/ooo-site/trunk/content/test/home.css
openoffice/ooo-site/trunk/content/test/styles.css

Modified: openoffice/ooo-site/trunk/content/test/exceptions.css
URL: 
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/test/exceptions.css?rev=1587346r1=1587345r2=1587346view=diff
==
--- openoffice/ooo-site/trunk/content/test/exceptions.css (original)
+++ openoffice/ooo-site/trunk/content/test/exceptions.css Mon Apr 14 22:13:52 
2014
@@ -1,3 +1,20 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the License); you may not use this file except in compliance with
+* the License.  You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an AS IS BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 img { border: 0px; }
 h1 { padding-left: 0.5em; }
 #hr { visibility:hidden; }
@@ -22,8 +39,8 @@ h1 { padding-left: 0.5em; }
 .optionset .first { margin-top: 0; }
 .optionset p.promotional { margin-top: 25px; }
 
-.green { background: url(cachedimages/button-green.png) #D1EAA0 right top 
no-repeat; }
-.green:hover { background: url(cachedimages/button-green.png) #C3E480 right 
-200px no-repeat; }
+.green { background: 
url(http://www.openoffice.org/cachedimages/button-green.png) #D1EAA0 right top 
no-repeat; }
+.green:hover { background: 
url(http://www.openoffice.org/cachedimages/button-green.png) #C3E480 right 
-200px no-repeat; }
 .green h2 a { color: #718D36; }
 .green:hover h2 a, #bodycol .green h2 a:hover { color: #546828; }
 .sub-green { background: #E9FEBE; border-top: 1px solid #C3E480; 
border-bottom: 1px solid #C3E480; font-size: .8em; }
@@ -43,22 +60,22 @@ h1 { padding-left: 0.5em; }
 .sub-grey p { padding: .1em 3%; width: 94%; cursor: default; }
 
 /* exchanged the normal picture with one that includes the extension 
repository graphic */
-.blue { background: url(cachedimages/button-blue-ext.png) #D8E5F6 right top 
no-repeat; }
-.blue:hover { background: url(cachedimages/button-blue-ext.png) #C3D9F1 right 
-200px no-repeat; }
+.blue { background: 
url(http://www.openoffice.org/cachedimages/button-blue-ext.png) #D8E5F6 right 
top no-repeat; }
+.blue:hover { background: 
url(http://www.openoffice.org/cachedimages/button-blue-ext.png) #C3D9F1 right 
-200px no-repeat; }
 .blue h2 a { color: #2D72CE; }
 .blue:hover h2 a, #bodycol .blue h2 a:hover { color: #21549A; }
 .sub-blue { background: #E1E1FF; border-top: 1px solid #D1D1FF; border-bottom: 
1px solid #D1D1FF; font-size: .8em; }
 .sub-blue p { padding: .1em 3%; width: 94%; }
 
-.yellow { background: url(cachedimages/button-yellow.png) #FFF379 right top 
no-repeat; }
-.yellow:hover { background: url(cachedimages/button-yellow.png) #FFF24F right 
-200px no-repeat; }
+.yellow { background: 
url(http://www.openoffice.org/cachedimages/button-yellow.png) #FFF379 right top 
no-repeat; }
+.yellow:hover { background: 
url(http://www.openoffice.org/cachedimages/button-yellow.png) #FFF24F right 
-200px no-repeat; }
 .yellow h2 a { color: #E09C09; }
 .yellow:hover h2 a, #bodycol .yellow h2 a:hover { color: #C80; }
 .sub-yellow { background: #FFFEAF; border-top: 1px solid #FBD34E; 
border-bottom: 1px solid #FBD34E; font-size: .8em; }
 .sub-yellow p { padding: .1em 3%; width: 94%; }
 
-.orange { background: url(cachedimages/button-orange.png) #FFD9A7 right 0 
no-repeat; }
-.orange:hover { background: url(cachedimages/button-orange.png) #FFBE67 right 
-200px no-repeat; }
+.orange { background: 
url(http://www.openoffice.org/cachedimages/button-orange.png) #FFD9A7 right 0 
no-repeat; }
+.orange:hover { background: 
url(http://www.openoffice.org/cachedimages/button-orange.png) #FFBE67 right 
-200px no-repeat; }
 .orange h2 a { color: #D36812; }
 .orange:hover h2 a, #bodycol .orange h2 a:hover { color: #C94800; }
 .sub-orange { background: #FFE2B5; border-top: 1px solid #FFB15E; 
border-bottom: 1px solid #FFB15E; font-size: .8em; }
@@ -68,7 +85,7 @@ h1 { padding-left: 0.5em; }
 .additionalinformation h2 { border-bottom: 1px solid #CCC; margin-bottom: 5px; 
margin-top: 0px; }
 .additionalinformation h3 { margin-left: 5px; margin-bottom: 5px; }
 .additionalinformation li { margin-left: 5px; font-size: 12px; }
-.additionalinformation 

svn commit: r906201 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/test/exceptions.css content/test/home.css content/test/styles.css

2014-04-14 Thread buildbot
Author: buildbot
Date: Mon Apr 14 22:14:26 2014
New Revision: 906201

Log:
Staging update by buildbot for ooo-site

Modified:
websites/staging/ooo-site/trunk/cgi-bin/   (props changed)
websites/staging/ooo-site/trunk/content/   (props changed)
websites/staging/ooo-site/trunk/content/test/exceptions.css
websites/staging/ooo-site/trunk/content/test/home.css
websites/staging/ooo-site/trunk/content/test/styles.css

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
--
--- cms:source-revision (original)
+++ cms:source-revision Mon Apr 14 22:14:26 2014
@@ -1 +1 @@
-1587344
+1587346

Propchange: websites/staging/ooo-site/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Mon Apr 14 22:14:26 2014
@@ -1 +1 @@
-1587344
+1587346

Modified: websites/staging/ooo-site/trunk/content/test/exceptions.css
==
--- websites/staging/ooo-site/trunk/content/test/exceptions.css (original)
+++ websites/staging/ooo-site/trunk/content/test/exceptions.css Mon Apr 14 
22:14:26 2014
@@ -1,3 +1,20 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the License); you may not use this file except in compliance with
+* the License.  You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an AS IS BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 img { border: 0px; }
 h1 { padding-left: 0.5em; }
 #hr { visibility:hidden; }
@@ -22,8 +39,8 @@ h1 { padding-left: 0.5em; }
 .optionset .first { margin-top: 0; }
 .optionset p.promotional { margin-top: 25px; }
 
-.green { background: url(cachedimages/button-green.png) #D1EAA0 right top 
no-repeat; }
-.green:hover { background: url(cachedimages/button-green.png) #C3E480 right 
-200px no-repeat; }
+.green { background: 
url(http://www.openoffice.org/cachedimages/button-green.png) #D1EAA0 right top 
no-repeat; }
+.green:hover { background: 
url(http://www.openoffice.org/cachedimages/button-green.png) #C3E480 right 
-200px no-repeat; }
 .green h2 a { color: #718D36; }
 .green:hover h2 a, #bodycol .green h2 a:hover { color: #546828; }
 .sub-green { background: #E9FEBE; border-top: 1px solid #C3E480; 
border-bottom: 1px solid #C3E480; font-size: .8em; }
@@ -43,22 +60,22 @@ h1 { padding-left: 0.5em; }
 .sub-grey p { padding: .1em 3%; width: 94%; cursor: default; }
 
 /* exchanged the normal picture with one that includes the extension 
repository graphic */
-.blue { background: url(cachedimages/button-blue-ext.png) #D8E5F6 right top 
no-repeat; }
-.blue:hover { background: url(cachedimages/button-blue-ext.png) #C3D9F1 right 
-200px no-repeat; }
+.blue { background: 
url(http://www.openoffice.org/cachedimages/button-blue-ext.png) #D8E5F6 right 
top no-repeat; }
+.blue:hover { background: 
url(http://www.openoffice.org/cachedimages/button-blue-ext.png) #C3D9F1 right 
-200px no-repeat; }
 .blue h2 a { color: #2D72CE; }
 .blue:hover h2 a, #bodycol .blue h2 a:hover { color: #21549A; }
 .sub-blue { background: #E1E1FF; border-top: 1px solid #D1D1FF; border-bottom: 
1px solid #D1D1FF; font-size: .8em; }
 .sub-blue p { padding: .1em 3%; width: 94%; }
 
-.yellow { background: url(cachedimages/button-yellow.png) #FFF379 right top 
no-repeat; }
-.yellow:hover { background: url(cachedimages/button-yellow.png) #FFF24F right 
-200px no-repeat; }
+.yellow { background: 
url(http://www.openoffice.org/cachedimages/button-yellow.png) #FFF379 right top 
no-repeat; }
+.yellow:hover { background: 
url(http://www.openoffice.org/cachedimages/button-yellow.png) #FFF24F right 
-200px no-repeat; }
 .yellow h2 a { color: #E09C09; }
 .yellow:hover h2 a, #bodycol .yellow h2 a:hover { color: #C80; }
 .sub-yellow { background: #FFFEAF; border-top: 1px solid #FBD34E; 
border-bottom: 1px solid #FBD34E; font-size: .8em; }
 .sub-yellow p { padding: .1em 3%; width: 94%; }
 
-.orange { background: url(cachedimages/button-orange.png) #FFD9A7 right 0 
no-repeat; }
-.orange:hover { background: url(cachedimages/button-orange.png) #FFBE67 right 
-200px no-repeat; }
+.orange { background: 
url(http://www.openoffice.org/cachedimages/button-orange.png) #FFD9A7 right 0 
no-repeat; }
+.orange:hover { background: 
url(http://www.openoffice.org/cachedimages/button-orange.png) #FFBE67 right 
-200px no-repeat; }
 .orange h2 a { color: 

svn commit: r1587357 - /openoffice/ooo-site/trunk/content/test/index.html

2014-04-14 Thread kschenk
Author: kschenk
Date: Mon Apr 14 23:10:05 2014
New Revision: 1587357

URL: http://svn.apache.org/r1587357
Log:
removed extra hr

Modified:
openoffice/ooo-site/trunk/content/test/index.html

Modified: openoffice/ooo-site/trunk/content/test/index.html
URL: 
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/test/index.html?rev=1587357r1=1587356r2=1587357view=diff
==
--- openoffice/ooo-site/trunk/content/test/index.html (original)
+++ openoffice/ooo-site/trunk/content/test/index.html Mon Apr 14 23:10:05 2014
@@ -70,9 +70,6 @@ screen reader.
 /script
 
 li
-  hr /
-/li
-li
   div class=action-help
 div class=action-text action-link
   a href=support/index.htmlh2I need help with my OpenOffice/h2




svn commit: r906206 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/test/index.html

2014-04-14 Thread buildbot
Author: buildbot
Date: Mon Apr 14 23:11:40 2014
New Revision: 906206

Log:
Staging update by buildbot for ooo-site

Modified:
websites/staging/ooo-site/trunk/cgi-bin/   (props changed)
websites/staging/ooo-site/trunk/content/   (props changed)
websites/staging/ooo-site/trunk/content/test/index.html

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
--
--- cms:source-revision (original)
+++ cms:source-revision Mon Apr 14 23:11:40 2014
@@ -1 +1 @@
-1587346
+1587357

Propchange: websites/staging/ooo-site/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Mon Apr 14 23:11:40 2014
@@ -1 +1 @@
-1587346
+1587357

Modified: websites/staging/ooo-site/trunk/content/test/index.html
==
--- websites/staging/ooo-site/trunk/content/test/index.html (original)
+++ websites/staging/ooo-site/trunk/content/test/index.html Mon Apr 14 23:11:40 
2014
@@ -86,9 +86,6 @@ screen reader.
 /script
 
 li
-  hr /
-/li
-li
   div class=action-help
 div class=action-text action-link
   a href=support/index.htmlh2I need help with my OpenOffice/h2




buildbot failure in ASF Buildbot on openoffice-fbsd-nightly

2014-04-14 Thread buildbot
Hi! , The openoffice-fbsd-nightly builder has just completed a run

STATUS: Failure

 Build revision 1587399 on branch openoffice/trunk

 Snapshot results at: http://ci.apache.org/projects/openoffice/

 Build using the ASF buildslave: bb-fbsd2_64bit

 Build results at: 
http://ci.apache.org/builders/openoffice-fbsd-nightly/builds/241

 Build reason was: The Nightly scheduler named 'openoffice-fbsd-nightly' 
triggered this build


 Yours Sincerely - The ASF Buildbot (http://ci.apache.org/)
--

 Join the bui...@apache.org mailing list for help with Buildbot